Merge branch 'master' of github.com:ryanhertz/spark_api into add-newsfeed-methods-to-saved-search-model

Author: ryanhertz

VERSION

@@ -1 +1 @@
-1.3.18
+1.3.21

lib/spark_api/models/finders.rb

@@ -8,6 +8,7 @@ def find(*arguments)
         scope = arguments.slice!(0)
         options = arguments.slice!(0) || {}
         case scope
+          when nil    then raise ArgumentError, "Argument for find() can't be nil"
           when :all   then find_every(options)
           when :first then find_every(options).first
           when :last  then find_every(options).last

lib/spark_api/models/listing.rb

@@ -128,8 +128,8 @@ def shared_notes(fore=nil)
         end
       end
 
-      def street_address
-        "#{self.StreetNumber} #{self.StreetDirPrefix} #{self.StreetName} #{self.StreetSuffix} #{self.StreetDirSuffix} #{self.StreetAdditionalInfo}".delete(DATA_MASK).strip().gsub(/\s{2,}/, ' ')
+      def street_address        
+        (self.UnparsedFirstLineAddress || '').delete(DATA_MASK).strip().gsub(/\s{2,}/, ' ')
       end
 
       def region_address

lib/spark_api/models/photo.rb

@@ -5,11 +5,11 @@ module Models
     class Photo < Base
       extend Subresource
       self.element_name = "photos"
-      
+
       attr_accessor :update_path
-      
+
       EDITABLE_FIELDS = [:Picture, :FileName, :Name, :Caption, :Primary]
-      
+
       def initialize(opts={})
         defaulted_opts = {}
         EDITABLE_FIELDS.each do |k|
@@ -19,10 +19,10 @@ def initialize(opts={})
         super(opts.merge(defaulted_opts))
       end
 
-      def primary? 
-        @attributes["Primary"] == true 
+      def primary?
+        @attributes["Primary"] == true
       end
-      
+
       def save(arguments={})
         begin
           return save!(arguments)
@@ -44,12 +44,12 @@ def save!(arguments={})
         load(result)
         true
       end
-      
+
       def load_picture(file_name)
         self.Picture = Base64.encode64(File.open(file_name, 'rb').read).gsub(/\n/, '')
         self.FileName = File.basename(file_name)
       end
-      
+
       def delete(args={})
         connection.delete("#{update_path}/#{self.Id}", args)
       end
@@ -58,15 +58,24 @@ def rollback(version)
         payload = {"Version" => version}
         connection.put "#{update_path}/#{self.Id}/versions/current", payload
       end
-      
+
+
+      def rotate!(direction)
+        unless [:clockwise, :counterclockwise].include? direction.to_sym
+          raise ArgumentError, "Photo rotate failed. '#{direction}' is not supported."
+        end
+        payload = { 'Photos' => [{'Rotate' => direction.to_s }] }
+        connection.put "#{self.update_path}/#{self.Id}", payload
+      end
+
       def exists?
         @attributes.include?("Id")
       end
-      
+
       private
-      
+
       def build_photo_hash
-        results_hash = {} 
+        results_hash = {}
         EDITABLE_FIELDS.each do |k|
           key = k.to_s
           results_hash[key] = @attributes[key] unless @attributes[key].nil?

spec/fixtures/listings/photos/rotate.json

@@ -0,0 +1,7 @@
+{
+  "D": {
+    "Photos": [
+      {"Rotate": "clockwise"}
+    ]
+  }
+}

spec/unit/spark_api/models/finders_spec.rb

@@ -32,4 +32,21 @@ class MyResource < Base
     resource.Id.should eq(1)
   end
 
+  describe "find" do
+
+    it "should throw an error if no argument is passed" do
+      stub_api_get("/my_resource/", 'finders.json')
+      lambda {
+        MyResource.find()
+      }.should raise_error(ArgumentError)
+    end
+
+    it "should throw an error when the first argument is nil" do
+      stub_api_get("/my_resource/", 'finders.json', {:_limit => 1})
+      lambda {
+        MyResource.find(nil, {:_limit => 1})
+      }.should raise_error(ArgumentError)
+    end
+
+  end
 end

spec/unit/spark_api/models/listing_spec.rb

@@ -11,6 +11,7 @@
         "City"=>"Fargo",
         "Longitude"=>"",
         "StreetName"=>"Someone's",
+        "UnparsedFirstLineAddress"=>"100 Someone's St",
         "YearBuilt"=>nil,
         "BuildingAreaTotal"=>"1321.0",
         "PublicRemarks"=>nil,
@@ -86,8 +87,22 @@
       @listing.should_not respond_to(:Videos)
     end
 
-    it "should return street address" do
-      @listing.street_address.should eq("100 Someone's St")
+    describe '.street_address' do
+      it 'should return the street address' do
+        @listing.street_address.should eq("100 Someone's St")
+      end
+
+      it 'should remove data masks' do
+        @listing.StandardFields["UnparsedFirstLineAddress"] = "********"
+        @listing.street_address.should eq("")
+      end
+
+      it 'should handle a missing unparsed first line address' do
+        [nil, '', ' '].each do |current|
+          @listing.StandardFields['UnparsedFirstLineAddress'] = current
+          @listing.street_address.should eq('')
+        end
+      end
     end
 
     it "should return the regional address" do

spec/unit/spark_api/models/photo_spec.rb

@@ -81,6 +81,18 @@
         subject.Id.should eq("20110826220032167405000000")
       end
 
+      on_put_it "should rotate a photo" do
+        stub_api_put('/listings/1234/photos/20110826220032167405000000', 'listings/photos/rotate.json', 'success.json')
+        subject.Id = "20110826220032167405000000"
+        subject.rotate!('clockwise')
+      end
+
+      on_put_it "should raise an exception for an invalid rotate parameter" do
+        stub_api_put('/listings/1234/photos/20110826220032167405000000', 'listings/photos/rotate.json', 'success.json')
+        subject.Id = "20110826220032167405000000"
+        expect { subject.rotate!('left') }.to raise_error(ArgumentError)
+      end
+
       on_delete_it "should delete a photo" do
         stub_api_delete('/listings/1234/photos/20110826220032167405000000','success.json')
         subject.Id = "20110826220032167405000000"