flexmls_api 0.6.5 → 0.7.0

data/spec/fixtures/listings/constraints.json

@@ -0,0 +1,18 @@
+{
+    "D": {
+        "Details": [
+            {
+	         "ListPrice": [ 
+	           {
+	              "RuleValue": 1000000.0,
+	              "RuleField": null,
+	              "RuleFieldValue": null, 
+	              "Value": 1000001.0,
+	              "RuleName": "MaxValue"
+               }
+             ]
+	       }
+        ],
+        "Success": true
+    }
+}

data/spec/fixtures/listings/constraints_with_pagination.json

@@ -0,0 +1,24 @@
+{
+    "D": {
+        "Details": [
+            {
+	         "ListPrice": [ 
+	           {
+	              "RuleValue": 1000000.0,
+	              "RuleField": null,
+	              "RuleFieldValue": null, 
+	              "Value": 1000001.0,
+	              "RuleName": "MaxValue"
+               }
+             ]
+	       }
+        ],
+	    "Pagination": {
+	      "TotalRows": 0,
+	      "PageSize": 1,
+	      "TotalPages": 1,
+	      "CurrentPage": 1
+	    },        
+        "Success": true
+    }
+}

data/spec/fixtures/listings/photos/new.json

@@ -0,0 +1,12 @@
+{
+    "D": {
+        "Photos": [
+            {
+                "Caption": "Creators of flexMLS!",
+                "Name": "FBS Logo",
+                "FileName": "logo_fbs.png",
+                "Picture": "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"
+            }
+        ]
+    }
+}

data/spec/fixtures/listings/photos/post.json

@@ -0,0 +1,20 @@
+{
+    "D": {
+        "Results": [
+            {
+                "Uri300": "http://photos.flexmls.com/fgo/20110826220032167405000000.jpg",
+                "ResourceUri": "/v1/listings/20050505200220759069000000/photos/20110826220032167405000000",
+                "Name": "Front",
+                "Uri800": "http://cdn.resize.flexmls.com/fgo/800x600/true/20110826220032167405000000-o.jpg",
+                "Id": "20110826220032167405000000",
+                "UriLarge": "http://photos.flexmls.com/fgo/20110826220032167405000000-o.jpg",
+                "Uri1024": "http://cdn.resize.flexmls.com/fgo/1024x768/true/20110826220032167405000000-o.jpg",
+                "Caption": "Creaters of flexMLS!",
+                "Uri1280": "http://cdn.resize.flexmls.com/fgo/1280x1024/true/20110826220032167405000000-o.jpg",
+                "Uri640": "http://cdn.resize.flexmls.com/fgo/640x480/true/20110826220032167405000000-o.jpg",
+                "UriThumb": "http://photos.flexmls.com/fgo/20110826220032167405000000-t.jpg"
+            }
+        ],
+        "Success": true
+    }
+}

data/spec/fixtures/listings/put.json

@@ -0,0 +1,5 @@
+{
+    "D": {
+      "ListPrice": 10000.0
+    }
+}

data/spec/fixtures/listings/with_permissions.json

@@ -0,0 +1,44 @@
+{
+    "D": {
+        "Results": [
+            {
+                "ResourceUri": "/v1/listings/20060725224713296297000000",
+                "StandardFields": {
+                    "StreetNumber": "7298",
+                    "Longitude": "-116.3237",
+                    "City": "Bonners Ferry",
+                    "ListingId": "06-9395",
+                    "PublicRemarks": "Afforadable home in town close to hospital,yet quiet country like setting. Good views. Must see",
+                    "BuildingAreaTotal": "924.0",
+                    "YearBuilt": 1977,
+                    "StreetName": "BIRCH",
+                    "ListPrice": "50000.0",
+                    "PostalCode": "83805",
+                    "VirtualTourURLBranded": "http://www.youtube.com/watch?v=T9uuPza41Uw#t=2s",
+                    "Latitude": "48.7001",
+                    "BathsThreeQuarter": null,
+                    "BathsFull": null,
+                    "BathsTotal": "1.0",
+                    "StateOrProvince": "ID",
+                    "PropertyType": "A",
+                    "StreetAdditionalInfo": null,
+                    "StreetDirPrefix": null,
+                    "BedsTotal": 3,
+                    "StreetDirSuffix": null,
+                    "ListingKey": "20060725224713296297000000",
+                    "ListOfficeName": "Century 21 On The Lake",
+                    "BathsHalf": null,
+                    "ModificationTimestamp": "2011-01-05T14:54:42Z",
+                    "CountyOrParish": "Boundary"
+                },
+                "Permissions": {
+                    "AvailableStatusChanges": ["A","C","D","E","P"],
+                    "Editable": true,
+                    "EditableSettings": {"StatusChange":true,"PriceChange":true, "Photos":false }
+                },
+                "Id": "20060725224713296297000000"
+            }
+        ],
+        "Success": true
+    }
+}

data/spec/mock_helper.rb

@@ -33,7 +33,8 @@ def stub_api_delete(service_path, stub_fixture="success.json", opts={})
   log_stub(s)
 end
 def stub_api_post(service_path, body, stub_fixture="success.json", opts={})
-  body_str = JSON.parse(fixture(body).read).to_json
+  body_hash = JSON.parse(fixture(body).read)
+  body_str = body_hash.to_json
   params = {:ApiUser => "foobar", :AuthToken => "c401736bf3d3f754f07c04e460e09573"}.merge(opts)
   sig = $test_client.authenticator.sign_token("/#{FlexmlsApi.version}#{service_path}", params, body_str)
   s=stub_request(:post, "#{FlexmlsApi.endpoint}/#{FlexmlsApi.version}#{service_path}").
@@ -50,7 +51,8 @@ def stub_api_post(service_path, body, stub_fixture="success.json", opts={})
   log_stub(s)
 end
 def stub_api_put(service_path, body, stub_fixture="success.json", opts={})
-  body_str = JSON.parse(fixture(body).read).to_json
+  body_hash = JSON.parse(fixture(body).read)
+  body_str = body_hash.to_json
   params = {:ApiUser => "foobar", :AuthToken => "c401736bf3d3f754f07c04e460e09573"}.merge(opts)
   sig = $test_client.authenticator.sign_token("/#{FlexmlsApi.version}#{service_path}", params, body_str)
   s=stub_request(:put, "#{FlexmlsApi.endpoint}/#{FlexmlsApi.version}#{service_path}").
@@ -68,7 +70,7 @@ def stub_api_put(service_path, body, stub_fixture="success.json", opts={})
 end
 
 def log_stub(s)
-  FlexmlsApi.logger.debug("Stubbed Request: #{s.inspect}")
+  FlexmlsApi.logger.debug("Stubbed Request: #{s.inspect} \n\n")
 end
 
 def mock_session()

data/spec/unit/flexmls_api/authentication/api_auth_spec.rb

@@ -96,7 +96,7 @@ describe FlexmlsApi::Authentication::ApiAuth  do
         with(:query => {
           :ApiSig => "1cb789831f8f4c6925dc708c93762a2c",
           :AuthToken => "1234"}.merge(args)).
-        to_return(:body => fixture("listing_no_subresources.json"))
+        to_return(:body => fixture("listings/no_subresources.json"))
       subject.session = session
       subject.request(:get, "/#{FlexmlsApi.version}/listings", nil, args).status.should eq(200)
     end
@@ -129,6 +129,15 @@ describe FlexmlsApi::Authentication::ApiAuth  do
     end
   end
   
+  describe "sign_token" do
+    let(:client) { FlexmlsApi::Client.new({:api_key => "my_key", :api_secret => "my_secret"}) }
+    subject {FlexmlsApi::Authentication::ApiAuth.new(client) }
+    it "should fully sign the token" do
+      parms = {:AuthToken => "1234", :ApiUser => "CoolAsIce"}
+      subject.sign_token("/test", parms).should eq("7bbe3384a8b64368357f8551cab271e3")
+    end
+  end
+  
   context "when the server says the session is expired (even if we disagree)" do
     it "should reset the session and reauthenticate" do
       reset_config
@@ -149,7 +158,7 @@ describe FlexmlsApi::Authentication::ApiAuth  do
             :_expand => "Documents"
           }).
           to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
-          to_return(:body => fixture('listing_with_documents.json'))
+          to_return(:body => fixture('listings/with_documents.json'))
       l = Listing.find('1234', :_expand => "Documents")
       
       count.should eq(2)

data/spec/unit/flexmls_api/authentication/base_auth_spec.rb

@@ -0,0 +1,10 @@
+require './spec/spec_helper'
+
+describe FlexmlsApi::Authentication::BaseAuth  do
+  subject {FlexmlsApi::Authentication::BaseAuth.new(nil) }
+  it "should raise an error" do
+    expect {subject.authenticate()}.to raise_error(){ |e| e.message.should == "Implement me!"}
+    expect {subject.logout()}.to raise_error(){ |e| e.message.should == "Implement me!"}
+    expect {subject.request(nil, nil, nil, nil)}.to raise_error(){ |e| e.message.should == "Implement me!"}
+  end
+end

data/spec/unit/flexmls_api/authentication/oauth2_spec.rb

@@ -75,7 +75,7 @@ describe FlexmlsApi::Authentication::OAuth2  do
       }
       c = stub_request(:get, "https://api.flexmls.com/#{FlexmlsApi.version}/listings").
         with(:query => args).
-        to_return(:body => fixture("listing_no_subresources.json"))
+        to_return(:body => fixture("listings/no_subresources.json"))
       subject.session = session
       subject.request(:get, "/#{FlexmlsApi.version}/listings", nil, args).status.should eq(200)
     end
@@ -118,7 +118,7 @@ describe FlexmlsApi::Authentication::OAuth2  do
         # Fail the first time, but then return the correct value after reauthentication
         stub_request(:get, "https://api.flexmls.com/#{FlexmlsApi.version}/listings/1234").
             to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
-            to_return(:body => fixture('listing_with_documents.json'))
+            to_return(:body => fixture('listings/with_documents.json'))
         client.get("/listings/1234")
         count.should eq(1)
         refresh_count.should eq(1)
@@ -138,7 +138,7 @@ describe FlexmlsApi::Authentication::OAuth2  do
         # Fail the first time, but then return the correct value after reauthentication
         stub_request(:get, "https://api.flexmls.com/#{FlexmlsApi.version}/listings/1234").
             to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
-            to_return(:body => fixture('listing_with_documents.json'))
+            to_return(:body => fixture('listings/with_documents.json'))
               
         client.get("/listings/1234")
         count.should eq(2)

data/spec/unit/flexmls_api/configuration/yaml_spec.rb

@@ -0,0 +1,70 @@
+require './spec/spec_helper'
+
+describe FlexmlsApi::Configuration::YamlConfig, "Yaml Config"  do
+  describe "api auth" do
+    let(:api_file){ "spec/config/flexmls_api/test_key.yml" }
+    it "should load a configured api key for development" do
+      subject.stub(:env){ {} }
+      subject.api_env.should eq("development")
+      subject.load_file(api_file)
+      subject.oauth2?.should eq(false)
+      subject.api_key.should eq("demo_key")
+      subject.api_secret.should eq("t3sts3cr3t")
+      subject.endpoint.should eq("http://api.dev.flexmls.com")
+      subject.name.should eq("test_key")
+      subject.client_keys.keys.should =~ [:api_key, :api_secret, :endpoint]
+      subject.oauth2_keys.keys.should eq([])
+    end
+    it "should load a configured api key for production" do
+      subject.stub(:env){ {"FLEXMLS_API_ENV" => "production"} }
+      subject.api_env.should eq("production")
+      subject.load_file(api_file)
+      subject.oauth2?.should eq(false)
+      subject.api_key.should eq("prod_demo_key")
+      subject.api_secret.should eq("prod_t3sts3cr3t")
+      subject.endpoint.should eq("http://api.test.flexmls.com")
+    end
+    it "should raise an error for a bad configuration" do
+      subject.stub(:env){ {} }
+      expect { subject.load_file("spec/config/flexmls_api/some_random_key.yml")}.to raise_error
+      subject.stub(:env){ {"RAILS_ENV" => "fake_env"} }
+      expect { subject.load_file(api_file)}.to raise_error
+    end
+  end
+  describe "oauth2" do
+    let(:oauth2_file){ "spec/config/flexmls_api/test_oauth.yml" }
+    it "should load a configured api key for development" do
+      subject.stub(:env){ {} }
+      subject.api_env.should eq("development")
+      subject.load_file(oauth2_file)
+      subject.oauth2?.should eq(true)
+      subject.authorization_uri.should eq("https://dev.flexmls.com/r/login/")
+      subject.access_uri.should eq("https://api.dev.flexmls.com/v1/oauth2/grant")
+      subject.redirect_uri.should eq("http://localhost/oauth2/callback")
+      subject.client_id.should eq("developmentid124nj4qu3pua")
+      subject.client_secret.should eq("developmentsecret4orkp29f")
+      subject.endpoint.should eq("http://api.dev.flexmls.com")
+      subject.name.should eq("test_oauth")
+      subject.client_keys.keys.should eq([:endpoint])
+      subject.oauth2_keys.keys.should =~ [:authorization_uri, :client_id, :access_uri, :client_secret, :redirect_uri]
+    end
+    it "should load a configured api key for production" do
+      subject.stub(:env){ {"FLEXMLS_API_ENV" => "production"} }
+      subject.api_env.should eq("production")
+      subject.load_file(oauth2_file)
+      subject.oauth2?.should eq(true)
+      subject.authorization_uri.should eq("https://www.flexmls.com/r/login/")
+      subject.access_uri.should eq("https://api.flexmls.com/v1/oauth2/grant")
+      subject.redirect_uri.should eq("http://localhost/oauth2/callback")
+      subject.client_id.should eq("production1id124nj4qu3pua")
+      subject.client_secret.should eq("productionsecret4orkp29fv")
+      subject.endpoint.should eq("http://api.flexmls.com")
+      subject.name.should eq("test_oauth")
+    end
+    
+    it "should list available keys" do
+      FlexmlsApi::Configuration::YamlConfig.stub(:config_path) { "spec/config/flexmls_api" }
+      subject.class.config_keys.should =~ ["test_key", "test_oauth"]
+    end
+  end
+end

data/spec/unit/flexmls_api/models/constraint_spec.rb

@@ -0,0 +1,19 @@
+require './spec/spec_helper'
+
+
+describe Constraint do
+  
+  subject do
+    Constraint.new(
+      "RuleValue" => 1000000.0,
+      "Value" => 1000001.0,
+      "RuleFieldValue" => 1.0,
+      "RuleField" => "ListPrice",
+      "RuleName" => "MaxValue")
+  end
+  
+  it "should print to string" do
+    subject.to_s.should eq("MaxValue: Field(ListPrice,1.0) Value(1000000.0,1000001.0)")
+  end
+
+end

data/spec/unit/flexmls_api/models/contact_spec.rb

@@ -12,7 +12,7 @@ describe Contact do
   end
 
   it "should get all my contacts" do
-    stub_api_get("/contacts", 'contacts.json')
+    stub_api_get("/contacts", 'contacts/contacts.json')
     contacts = Contact.get
     contacts.should be_an(Array)
     contacts.length.should eq(3)
@@ -20,7 +20,7 @@ describe Contact do
   end
 
   it "should get a single contact when using #my" do
-    stub_api_get("/my/contact", 'contact_my.json')
+    stub_api_get("/my/contact", 'contacts/my.json')
     contact = Contact.my
     contact.should be_a(Contact)
     contact.Id.should == '20090928182824338901000000'
@@ -28,7 +28,7 @@ describe Contact do
   end
 
   it "should get all my Tags" do
-    stub_api_get("/contacts/tags", 'contact_tags.json')
+    stub_api_get("/contacts/tags", 'contacts/tags.json')
     tags = Contact.tags
     tags.should be_an(Array)
     tags.length.should eq(4)
@@ -36,7 +36,7 @@ describe Contact do
   end
   
   it "should get all my Tags" do
-    stub_api_get("/contacts/tags/IDX%20Lead", 'contacts.json')
+    stub_api_get("/contacts/tags/IDX%20Lead", 'contacts/contacts.json')
     contacts = Contact.by_tag("IDX Lead")
     contacts.should be_an(Array)
     contacts.length.should eq(3)
@@ -45,7 +45,7 @@ describe Contact do
   end
     
   it "should save a new contact" do
-    stub_api_post("/contacts", 'contact_new.json', 'contacts_post.json')
+    stub_api_post("/contacts", 'contacts/new.json', 'contacts/post.json')
     c=Contact.new
     c.attributes["DisplayName"] = "Contact Four"
     c.attributes["PrimaryEmail"] = "contact4@fbsdata.com"
@@ -54,7 +54,7 @@ describe Contact do
   end
 
   it "should save a new contact and notify" do
-    stub_api_post("/contacts", 'contact_new_notify.json', 'contacts_post.json')
+    stub_api_post("/contacts", 'contacts/new_notify.json', 'contacts/post.json')
     c=Contact.new
     c.notify=true
     c.attributes["DisplayName"] = "Contact Four"
@@ -64,7 +64,7 @@ describe Contact do
   end
 
   it "should fail saving" do
-    stub_api_post("/contacts", 'contact_new_empty.json') do |request|
+    stub_api_post("/contacts", 'contacts/new_empty.json') do |request|
       request.to_return(:status => 400, :body => fixture('errors/failure.json'))
     end
 
@@ -75,7 +75,7 @@ describe Contact do
   
   context "on an epic fail" do
     it "should fail saving and asplode" do
-      stub_api_post("/contacts", 'contact_new_empty.json') do |request|
+      stub_api_post("/contacts", 'contacts/new_empty.json') do |request|
         request.to_return(:status => 500, :body => fixture('errors/failure.json'))
       end