filemaker 0.0.19 → 1.0.0

data/lib/filemaker/store/database_store.rb

@@ -10,7 +10,7 @@ module Filemaker
       end
 
       def all
-        response, _params = @server.perform_request(:post, '-dbnames', nil)
+        response, _params = @server.perform_request('-dbnames', nil)
         resultset = Filemaker::Resultset.new(@server, response.body)
         resultset.map do |record|
           record['DATABASE_NAME']

data/lib/filemaker/store/layout_store.rb

@@ -12,7 +12,7 @@ module Filemaker
 
       def all
         args = { '-db' => @database.name }
-        response, _params = @server.perform_request(:post, '-layoutnames', args)
+        response, _params = @server.perform_request('-layoutnames', args)
         resultset = Filemaker::Resultset.new(@server, response.body)
         resultset.map do |record|
           record['LAYOUT_NAME']

data/lib/filemaker/store/script_store.rb

@@ -12,7 +12,7 @@ module Filemaker
 
       def all
         args = { '-db' => @database.name }
-        response, _params = @server.perform_request(:post, '-scriptnames', args)
+        response, _params = @server.perform_request('-scriptnames', args)
         resultset = Filemaker::Resultset.new(@server, response.body)
         resultset.map do |record|
           record['SCRIPT_NAME']

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.19'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/filemaker/layout_spec.rb

@@ -14,7 +14,7 @@ describe Filemaker::Layout do
         config.password     = 'password'
       end
 
-      fake_post_response(@server, nil, 'employment.xml')
+      fake_typhoeus_post('employment.xml')
       @layout = @server.db['candidates']['Profile']
     end
 

data/spec/filemaker/metadata/field_spec.rb

@@ -14,67 +14,67 @@ describe Filemaker::Metadata::Field do
   context 'coercion' do
     it 'converts to nil for empty string' do
       allow(field).to receive(:data_type).and_return 'text'
-      expect(field.coerce('')).to be_nil
+      expect(field.raw_cast('')).to be_nil
     end
 
     it 'converts to nil for space string' do
       allow(field).to receive(:data_type).and_return 'text'
-      expect(field.coerce('   ')).to be_nil
+      expect(field.raw_cast('   ')).to be_nil
     end
 
     it 'converts to nil for nil' do
       allow(field).to receive(:data_type).and_return 'text'
-      expect(field.coerce(nil)).to be_nil
+      expect(field.raw_cast(nil)).to be_nil
     end
 
     it 'converts text to String' do
       allow(field).to receive(:data_type).and_return 'text'
-      expect(field.coerce('some text value')).to be_a String
+      expect(field.raw_cast('some text value')).to be_a String
     end
 
     it 'converts number to BigDecimal' do
       allow(field).to receive(:data_type).and_return 'number'
-      expect(field.coerce('100')).to be_a BigDecimal
+      expect(field.raw_cast('100')).to be_a BigDecimal
     end
 
     it 'removes decimal mark in number' do
       allow(field).to receive(:data_type).and_return 'number'
-      expect(field.coerce('49,028.39')).to be_a BigDecimal
-      expect(field.coerce('49,028.39')).to eq 49_028.39
+      expect(field.raw_cast('49,028.39')).to be_a BigDecimal
+      expect(field.raw_cast('49,028.39')).to eq 49_028.39
     end
 
     it 'removes dollar sign in number' do
       allow(field).to receive(:data_type).and_return 'number'
-      expect(field.coerce('$49,028.39')).to be_a BigDecimal
-      expect(field.coerce('$49,028.39')).to eq 49_028.39
+      expect(field.raw_cast('$49,028.39')).to be_a BigDecimal
+      expect(field.raw_cast('$49,028.39')).to eq 49_028.39
     end
 
     it 'converts date to Date' do
       allow(field).to receive(:data_type).and_return 'date'
-      expect(field.coerce('10/31/2014')).to be_a Date
+      expect(field.raw_cast('10/31/2014')).to be_a Date
     end
 
     it 'converts time to DateTime' do
       allow(field).to receive(:data_type).and_return 'time'
-      expect(field.coerce('12:12:12')).to be_a DateTime
+      expect(field.raw_cast('12:12:12')).to be_a DateTime
     end
 
     it 'converts timestamp to DateTime' do
       allow(field).to receive(:data_type).and_return 'timestamp'
-      expect(field.coerce('10/31/2014 12:12:12')).to be_a DateTime
+      expect(field.raw_cast('10/31/2014 12:12:12')).to be_a DateTime
     end
 
     it 'converts container to URI' do
       allow(field).to receive(:data_type).and_return 'container'
-      expect(field.coerce('/fmi/xml/cnt/1234jpg')).to be_a URI
-      expect(field.coerce('/fmi/xml/cnt/1234jpg').to_s).to eq \
+      expect(field.raw_cast('/fmi/xml/cnt/1234jpg')).to be_a URI
+      expect(field.raw_cast('/fmi/xml/cnt/1234jpg').to_s).to eq \
         'https://host/fmi/xml/cnt/1234jpg'
     end
 
     it 'converts container with existing http' do
       allow(field).to receive(:data_type).and_return 'container'
-      expect(field.coerce('http://host/fmi/xml/cnt/1234jpg')).to be_a URI
-      expect(field.coerce('http://host/fmi/xml/cnt/1234jpg').to_s).to eq \
+      expect(field.raw_cast('http://host/fmi/xml/cnt/1234jpg')).to be_a URI
+      expect(field.raw_cast('http://host/fmi/xml/cnt/1234jpg').to_s).to eq \
         'http://host/fmi/xml/cnt/1234jpg'
     end
   end

data/spec/filemaker/model/builder_spec.rb

@@ -24,6 +24,11 @@ describe Filemaker::Model::Builder do
     it 'has a modify_date' do
       expect(subject.modify_date).to eq(Date.parse('2014-08-12'))
     end
+
+    it 'is not dirty' do
+      expect(subject.changed?).to eq false
+      expect(subject.changes).to be_empty
+    end
   end
 
   context '.collection' do

data/spec/filemaker/model/criteria_spec.rb

@@ -311,13 +311,14 @@ describe Filemaker::Model::Criteria do
       expect(criteria.per(50).options[:max]).to eq 50
     end
 
-    it 'sets the page to skip' do
-      expect(criteria.page(2).per(50).options[:skip]).to eq 50
-    end
-
-    it 'sets the page to skip with larger page' do
-      expect(criteria.page(12).per(50).options[:skip]).to eq 550
-    end
+    # Disable these 2 tests because page() will immediately execute .all
+    # it 'sets the page to skip' do
+    #   expect(criteria.page(2).per(50).options[:skip]).to eq 50
+    # end
+
+    # it 'sets the page to skip with larger page' do
+    #   expect(criteria.page(12).per(50).options[:skip]).to eq 550
+    # end
 
     it 'will not populate skip option if there is no page' do
       expect(criteria.per(50).options[:skip]).to be_nil

data/spec/filemaker/model/types_spec.rb

@@ -0,0 +1,103 @@
+describe Filemaker::Model::Types do
+  let(:model) { MyModel.new }
+
+  context 'Types::Text' do
+    it 'assign as a string' do
+      model.name = 'hello'
+      expect(model.name).to be_a String
+      expect(model.name).to eq 'hello'
+    end
+
+    it 'query as a string' do
+      c = MyModel.where(name: 'hello')
+      expect(c.selector['name']).to be_a String
+      expect(c.selector['name']).to eq 'hello'
+    end
+  end
+
+  context 'Types::Date' do
+    it 'assign as a date' do
+      model.created_at = Date.new(2018, 1, 1)
+      expect(model.created_at).to be_a Date
+      expect(model.created_at).to eq Date.new(2018, 1, 1)
+    end
+
+    it 'can query as a string' do
+      c = MyModel.where(created_at: '12/2018')
+      expect(c.selector['created_at']).to be_a String
+      expect(c.selector['created_at']).to eq '12/2018'
+    end
+
+    it 'can query as a date' do
+      c = MyModel.where(created_at: Date.new(2018, 1, 1))
+      expect(c.selector['created_at']).to be_a Date
+      expect(c.selector['created_at']).to eq Date.new(2018, 1, 1)
+    end
+  end
+
+  context 'Types::Time' do
+    it 'assign as a time' do
+      model.updated_at = Time.new(2018, 1, 1, 12, 12, 12)
+      expect(model.updated_at).to be_a Time
+      expect(model.updated_at).to eq Time.new(2018, 1, 1, 12, 12, 12)
+    end
+
+    it 'can query as a string' do
+      c = MyModel.where(updated_at: '2018')
+      expect(c.selector['modifieddate']).to be_a String
+      expect(c.selector['modifieddate']).to eq '2018'
+    end
+
+    it 'can query as a time' do
+      c = MyModel.where(updated_at: Time.new(2018, 1, 1, 12, 12, 12))
+      expect(c.selector['modifieddate']).to be_a Time
+      expect(c.selector['modifieddate']).to eq Time.new(2018, 1, 1, 12, 12, 12)
+    end
+  end
+
+  context 'Types::BigDecimal' do
+    it 'assign as a big decimal' do
+      model.salary = '25'
+      expect(model.salary).to be_a BigDecimal
+      expect(model.salary).to eq 25.0
+    end
+
+    it 'query as a big decimal' do
+      c = MyModel.where(salary: 23.7)
+      expect(c.selector['salary']).to be_a BigDecimal
+      expect(c.selector['salary']).to eq 23.7
+    end
+  end
+
+  context 'Types::Integer' do
+    it 'assign as an integer' do
+      model.age = '25'
+      expect(model.age).to be_a Integer
+      expect(model.age).to eq 25
+    end
+
+    it 'query as an integer' do
+      c1 = MyModel.where(age: 40)
+      expect(c1.selector['passage of time']).to be_a Integer
+      expect(c1.selector['passage of time']).to eq 40
+
+      c2 = MyModel.where(age: '31')
+      expect(c2.selector['passage of time']).to be_a Integer
+      expect(c2.selector['passage of time']).to eq 31
+    end
+  end
+
+  context 'Types::Email' do
+    it 'assign as an email' do
+      model.backup_email = 'bob@example.com'
+      expect(model.backup_email).to be_a String
+      expect(model.backup_email).to eq 'bob@example.com'
+    end
+
+    it 'query by replacing @ with \@' do
+      c = MyModel.where(backup_email: 'bob@example.com')
+      expect(c.selector['backup_email']).to be_a String
+      expect(c.selector['backup_email']).to eq 'bob\@example.com'
+    end
+  end
+end

data/spec/filemaker/model_spec.rb

@@ -58,7 +58,8 @@ describe Filemaker::Model do
     expect(model.backup_email.to_s).to eq 'dated@example.com'
 
     model.backup_email = 'don want to give email add'
-    expect(model.backup_email.to_s).to be_nil
+    # expect(model.backup_email.to_s).to be_nil
+    expect(model.backup_email.to_s).to eq ''
 
     model.backup_email = 'a＠host.com'
     expect(model.backup_email.to_s).to eq 'a@host.com'
@@ -71,7 +72,7 @@ describe Filemaker::Model do
     model.backup_email = 'one@host.com'
     expect(model.backup_email).to eq 'one@host.com'
 
-    other_email = Filemaker::Model::Types::Email.new('one@host.com')
+    other_email = 'one@host.com'
     expect(model.backup_email).to eq other_email
   end
 
@@ -87,8 +88,7 @@ describe Filemaker::Model do
         'created_at',
         'modifieddate',
         'salary',
-        'passage of time',
-        'document'
+        'passage of time'
       ]
   end
 
@@ -140,15 +140,6 @@ describe Filemaker::Model do
     expect(model.cache_key).to eq 'my_models/CA123'
   end
 
-  it 'has attachment' do
-    model.document = URI.parse('http://host/somefile.pdf')
-    expect(model.document.url).to eq 'http://host/somefile.pdf'
-    expect(model.document.filename).to eq 'somefile.pdf'
-    model.document.body
-    expect(model.document.extension).to eq '.pdf'
-    expect(model.document.content_type).to eq 'application/pdf'
-  end
-
   describe 'process_attributes' do
     it 'accepts a hash of attributes' do
       model = MyModel.new(name: 'Bob', email: 'bob@cern.org')

data/spec/filemaker/record_spec.rb

@@ -36,7 +36,7 @@ describe Filemaker::Record do
 
   it 'Salary should be an array of BigDecimal' do
     expect(@record['Salary']).to be_an Array
-    expect(@record['SALARY']).to eq [BigDecimal.new(5000), BigDecimal.new(6000)]
+    expect(@record['SALARY']).to eq [BigDecimal(5000), BigDecimal(6000)]
   end
 
   it 'has 2 portals' do

data/spec/filemaker/server_spec.rb

@@ -11,11 +11,6 @@ describe Filemaker::Server do
       expect(server.url).to eq 'http://example.com'
       expect(server.account_name).to eq 'account_name'
       expect(server.password).to eq 'password'
-      expect(server.connection).to be_a Faraday::Connection
-      expect(server.connection.headers[:user_agent]).to \
-        eq "filemaker-ruby-#{Filemaker::VERSION}"
-      expect(server.connection.headers[:authorization]).to \
-        eq 'Basic YWNjb3VudF9uYW1lOnBhc3N3b3Jk'
     end
 
     it 'specifically ask for no SSL' do
@@ -50,7 +45,7 @@ describe Filemaker::Server do
       end
 
       expect(server.url).to eq 'https://example.com'
-      expect(server.connection.ssl[:verify]).to be false
+      expect(server.ssl[:verify]).to be false
     end
   end
 
@@ -78,7 +73,8 @@ describe Filemaker::Server do
     end
 
     it 'raises Filemaker::Errors::CommunicationError if status = 0' do
-      fake_error(@server, nil, 0)
+      # fake_error(@server, nil, 0)
+      fake_typhoeus_error(0)
 
       expect do
         @server.databases.all
@@ -86,7 +82,8 @@ describe Filemaker::Server do
     end
 
     it 'raises Filemaker::Errors::CommunicationError if status = 404' do
-      fake_error(@server, nil, 404)
+      # fake_error(@server, nil, 404)
+      fake_typhoeus_error(404)
 
       expect do
         @server.databases.all
@@ -94,7 +91,8 @@ describe Filemaker::Server do
     end
 
     it 'raises Filemaker::Errors::AuthenticationError if status = 401' do
-      fake_error(@server, nil, 401)
+      # fake_error(@server, nil, 401)
+      fake_typhoeus_error(401)
 
       expect do
         @server.databases.all

data/spec/filemaker/store/database_store_spec.rb

@@ -20,7 +20,7 @@ describe Filemaker::Store::DatabaseStore do
         config.password     = 'password'
       end
 
-      fake_post_response(server, nil, 'dbnames.xml')
+      fake_typhoeus_post('dbnames.xml')
 
       expected_result = %w[Billing Candidates Employee Jobs]
 

data/spec/filemaker/store/layout_store_spec.rb

@@ -20,7 +20,7 @@ describe Filemaker::Store::LayoutStore do
         config.password     = 'password'
       end
 
-      fake_post_response(server, nil, 'layoutnames.xml')
+      fake_typhoeus_post('layoutnames.xml')
 
       expect(server.db['candidates'].layouts.all).to eq \
         ['Dashboard', 'Calender', 'Profile', 'Resume', 'Job Application']

data/spec/filemaker/store/script_store_spec.rb

@@ -20,7 +20,7 @@ describe Filemaker::Store::ScriptStore do
         config.password     = 'password'
       end
 
-      fake_post_response(server, nil, 'scriptnames.xml')
+      fake_typhoeus_post('scriptnames.xml')
 
       expect(server.db['candidates'].scripts.all).to eq \
         ['library', 'open job', 'copy resume']

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'filemaker'
+require 'pry'
 require_relative 'support/xml_loader'
 require_relative 'support/models'
 
@@ -22,6 +23,10 @@ require_relative 'support/models'
 RSpec.configure do |config|
   config.include XmlLoader
 
+  config.before :each do
+    Typhoeus::Expectation.clear
+  end
+
   # The settings below are suggested to provide a good initial experience
   # with RSpec, but feel free to customize to your heart's content.
 

data/spec/support/models.rb

@@ -73,7 +73,6 @@ class MyModel
   datetime :updated_at, fm_name: 'ModifiedDate'
   money :salary
   integer :age, fm_name: 'passage of time'
-  object :document
 end
 
 class Project

data/spec/support/xml_loader.rb

@@ -3,27 +3,15 @@ module XmlLoader
     File.read(File.dirname(__FILE__) + '/responses/' + filename)
   end
 
-  def fake_post_response(server, body, xml)
-    server.connection.builder.use Faraday::Adapter::Test do |stub|
-      stub.post '/fmi/xml/fmresultset.xml', body do
-        [200, {}, import_xml_as_string(xml)]
-      end
-    end
+  def fake_typhoeus_post(xml)
+    Typhoeus.stub('http://example.com/fmi/xml/fmresultset.xml').and_return(
+      Typhoeus::Response.new(code: 200, body: import_xml_as_string(xml))
+    )
   end
 
-  def fake_get_response(server, query_string, xml)
-    server.connection.builder.use Faraday::Adapter::Test do |stub|
-      stub.get "/fmi/xml/fmresultset.xml?#{query_string}" do
-        [200, {}, import_xml_as_string(xml)]
-      end
-    end
-  end
-
-  def fake_error(server, body, status_code)
-    server.connection.builder.use Faraday::Adapter::Test do |stub|
-      stub.post '/fmi/xml/fmresultset.xml', body do
-        [status_code, {}, '']
-      end
-    end
+  def fake_typhoeus_error(status_code)
+    Typhoeus.stub('http://example.com/fmi/xml/fmresultset.xml').and_return(
+      Typhoeus::Response.new(code: status_code)
+    )
   end
 end