filemaker 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b5ad4c9868171da5694e25de70b5600debedbe
-  data.tar.gz: 54c42d1c9e3a4664b6fbceaa0252c1460b356629
+  metadata.gz: 87a4555ad4c5f09c28a044bb5b688fbdc527c374
+  data.tar.gz: f2cff3d87e7644b6a6bfd4390fc5f55216aa410b
 SHA512:
-  metadata.gz: f9d5ac6b04b0205d53b69de121bbb9bde10d57f08746ce7b3f66f4cc0702c7e3475cbf92300d768fe245a3a7b73139fdf4e2b48a358c4b6b90e55c8e501cd42b
-  data.tar.gz: a8578655262153e2f22735280df49a67acb380f5a10c1c6bf9b0003680ee1a1b4ad98f50debe2e628fb638ab85475d184a47ec5f2d6b93b980a5251fabbdcf21
+  metadata.gz: b0872f4b1248bcad5ada6c5ce699387d144f3d495b354c8afbf0b145f66534b27c84d6e1a5b136c0e47a10d30cd18fd3eed5bd4f7ea102b71b6dba423d2834cb
+  data.tar.gz: 805aea2ce462c4aa61648136adbcd6a7ba50151cddc9d408bfcba3d4ae3523350c2f14e1d24e3f6e38d03e3cd9b9e6a5ce3cd801e6a5aa11a06907025ab38661

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.3.0
 script: "bundle exec rake"

data/filemaker.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'activemodel'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'pry-byebug'

data/lib/filemaker/model/criteria.rb

@@ -63,6 +63,8 @@ module Filemaker
           klass.api.find(selector, options).count
         elsif chains.include?(:in)
           klass.api.query(selector, options).count
+        elsif chains.include?(:custom)
+          klass.api.findquery(selector, options).count
         else
           klass.api.findall(options).count
         end
@@ -80,6 +82,9 @@ module Filemaker
         elsif chains.include?(:in)
           # Use -findquery
           resultset = klass.api.query(selector, options)
+        elsif chains.include?(:custom)
+          # Use -findquery directly
+          resultset = klass.api.findquery(selector, options)
         else
           # Use -findall
           limit(1) unless limit?

data/lib/filemaker/model/field.rb

@@ -17,6 +17,9 @@ module Filemaker
       #
       # If the value is `==` (match empty) or `=*` (match record), then we will
       # skip coercion.
+      #
+      # Date and DateTime will be special. If the value is a String, the query
+      # may be '2016', '3/2016' or '3/24/2016' for example.
       def coerce(value)
         return nil if value.nil?
         return value if value == '==' || value == '=*'
@@ -30,15 +33,17 @@ module Filemaker
           BigDecimal.new(value.to_s)
         elsif @type == Date
           return value if value.is_a? Date
+          return value.to_s if value.is_a? String
           Date.parse(value.to_s)
         elsif @type == DateTime
           return value if value.is_a? DateTime
+          return value.to_s if value.is_a? String
           DateTime.parse(value.to_s)
         else
           value
         end
-      rescue
-        warn "Could not coerce #{name}: #{value}"
+      rescue Exception => e
+        warn "[#{e.message}] Could not coerce #{name}: #{value}"
         value
       end
     end

data/lib/filemaker/model/findable.rb

@@ -25,6 +25,7 @@ module Filemaker
         :begins_with,
         :ends_with,
         :not,
+        :custom_query,
         :where, to: :criteria
 
       def criteria

data/lib/filemaker/model/selectable.rb

@@ -10,6 +10,7 @@ module Filemaker
         raise Filemaker::Errors::MixedClauseError,
               "Can't mix 'where' with 'in'." if chains.include?(:in)
         chains.push(:where)
+        chains.delete(:in)
 
         @selector ||= {}
         selector.merge!(klass.with_model_fields(criterion))
@@ -58,6 +59,7 @@ module Filemaker
                 "Can't mix 'where' with 'in'." if chains.include?(:in)
           chains.push(operator.to_sym)
           chains.push(:where) unless chains.include?(:where) # Just one time
+          chains.delete(:in)
           @selector ||= {}
 
           criterion = if operator == 'bw'
@@ -100,6 +102,7 @@ module Filemaker
         raise Filemaker::Errors::MixedClauseError,
               "Can't mix 'in' with 'where'." if chains.include?(:where)
         chains.push(:in)
+        chains.delete(:where)
         @selector ||= []
 
         become_array(criterion).each do |hash|
@@ -112,6 +115,14 @@ module Filemaker
         self
       end
 
+      def custom_query(criterion)
+        chains.push(:custom)
+        chains.delete(:where)
+        chains.delete(:in)
+        @selector = criterion
+        self
+      end
+
       # Simply append '-omit' => true to all criteria
       def not_in(criterion)
         self.in(criterion, true)

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/spec/filemaker/model/criteria_spec.rb

@@ -40,6 +40,15 @@ describe Filemaker::Model::Criteria do
       end
     end
 
+    describe 'custom_query' do
+      it 'remove :where chain' do
+        query = { '-query' => 'this is custom' }
+        criteria.where(name: 'Bob').custom_query(query)
+        expect(criteria.chains).to eq [:custom]
+        expect(criteria.selector).to eq query
+      end
+    end
+
     describe 'find' do
       it 'resets the selector and will not double :where' do
         allow(criteria).to receive(:first).and_return(nil)

data/spec/filemaker/model_spec.rb

@@ -49,10 +49,10 @@ describe Filemaker::Model do
     expect(model.salary).to be_a BigDecimal
   end
 
-  it 'created_at is Date' do
-    model.created_at = '4/12/2014'
-    expect(model.created_at).to be_a Date
-  end
+  # it 'created_at is Date' do
+  #   model.created_at = '4/12/2014'
+  #   expect(model.created_at).to be_a Date
+  # end
 
   it 'accepts date range as string' do
     model.created_at = '1/1/2016...1/31/2016'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement