filemaker 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c7d9adebe5082b877308f9f9288ac84e10c264c
-  data.tar.gz: ea39999151fd8c509658a39c84428ef436a3c870
+  metadata.gz: 5ee29da2611c5857916b7f97e6785080495caafb
+  data.tar.gz: 85142a5af79b15ca89df2c2df05c272ece4c1b96
 SHA512:
-  metadata.gz: 5afdcecee22c8fcae980cb5044bbef9d3a7b17856c8b8583a3d8c2f4b4e393539d73da5a43b9461eef6910f501b448c03e2a9a093653ce1ef31ffa4e08c861c0
-  data.tar.gz: d6c55a51482c889e3931f281c13a9a7edb67202e5a46c6e8da596c6d11c69eee42fb1c8608d27f84efa42b44b4e3153f429690c31b7c640f9529d687127daff4
+  metadata.gz: bdf8376dfd66c133f426264a67e5c2aaf0277d90561436f9a3944bcb91100c4a55dcb65457181b8a88d349369348b970e46d5fe086bec2753eb64539292213ef
+  data.tar.gz: 378d3ba7d1f34637dce2913fb5961c89c8717e28923df5089668e6e56ae8b44b788b5007d4248cce4540a65de71b81517bc56582573f4d87545f76cd1be8fb32

data/.rubocop.yml

@@ -22,3 +22,21 @@ SpecialGlobalVars:
 
 PredicateName:
   Enabled: false
+
+Metrics/AbcSize:
+  Max: 50
+
+Metrics/ClassLength:
+  Max: 200
+
+Metrics/BlockLength:
+  Max: 100
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false

data/.travis.yml

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

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2014 mech
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2017 mech
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -197,8 +197,8 @@ Note: It is vitally important that you get the order right for mixing in the use
 - [x] Please test the comparison operators with keyword as well as applied to value.
 - [x] Test serialization of BigDecimal and other types.
 - [x] Caching of relation models.
+- [x] Dirty checking API for model.
 - [ ] Test the order for `in` and `not_in` found set accuracy.
-- [ ] Dirty checking API for model.
 
 ## Pagination
 
@@ -222,6 +222,10 @@ end
 Job.per_page # => 50
 ```
 
+## Overview
+
+`Model` include `Findable` which create `Criteria` and `execute()` to return `Resultset` to be built by `Builder`.
+
 ## Credits
 
 This project is heavily inspired by the following Filemaker Ruby effort and several other ORM gems.

data/filemaker.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'typhoeus'
-  spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.7'
   spec.add_runtime_dependency 'activemodel'
   spec.add_runtime_dependency 'globalid'
 
-  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 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'pry-byebug'
 end

data/lib/filemaker/api/query_commands/findquery.rb

@@ -80,7 +80,8 @@ module Filemaker
           omit = q_tag_array.delete('-omit')
           len = q_tag_array.length
           result = q_tag_array.flatten.combination(len).select do |c|
-            q_tag_array.all? { |a| (a & c).size > 0 }
+            # q_tag_array.all? { |a| (a & c).size > 0 }
+            q_tag_array.all? { |a| !(a & c).empty? }
           end
           result = result.each { |c| c.unshift('-omit') if omit }
           @key_maps.concat result

data/lib/filemaker/configuration.rb

@@ -21,8 +21,12 @@ module Filemaker
       ssl.is_a?(Hash) ? { ssl: ssl } : {}
     end
 
+    def is_ssl?
+      ssl.is_a?(Hash) || ssl == true
+    end
+
     def url
-      (ssl.is_a?(Hash) || ssl == true) ? "https://#{host}" : "http://#{host}"
+      is_ssl? ? "https://#{host}" : "http://#{host}"
     end
   end
 end

data/lib/filemaker/metadata/field.rb

@@ -33,13 +33,17 @@ module Filemaker
         @resultset  = resultset
       end
 
+      def remove_decimal_mark(value)
+        value.delete('$,')
+      end
+
       def coerce(value)
         value = value.to_s.strip
         return nil if value.empty?
 
         case data_type
         when 'number'
-          BigDecimal.new(value)
+          BigDecimal.new(remove_decimal_mark(value))
         when 'date'
           # date_format likely will be '%m/%d/%Y', but if we got '19/8/2014',
           # then `strptime` will raise invalid date error

data/lib/filemaker/model/field.rb

@@ -42,7 +42,7 @@ module Filemaker
         else
           value
         end
-      rescue Exception => e
+      rescue StandardError => e
         warn "[#{e.message}] Could not coerce #{name}: #{value}"
         value
       end

data/lib/filemaker/model/persistable.rb

@@ -67,7 +67,7 @@ module Filemaker
         freeze
       end
 
-      alias_method :delete, :destroy
+      alias delete destroy
 
       # If value is nil, we convert to empty string so it will get pick up by
       # `fm_attributes`

data/lib/filemaker/model/relations/belongs_to.rb

@@ -25,8 +25,8 @@ module Filemaker
         # all must be findable using `to find_field_by_name`
         def final_reference_key
           target_class.find_field_by_name(source_key).try(:name) ||
-          target_class.find_field_by_name(reference_key).try(:name) ||
-          target_class.identity.try(:name)
+            target_class.find_field_by_name(reference_key).try(:name) ||
+            target_class.identity.try(:name)
         end
 
         protected

data/lib/filemaker/model/relations/has_many.rb

@@ -25,8 +25,8 @@ module Filemaker
 
         def final_reference_key
           target_class.find_field_by_name(source_key).try(:name) ||
-          target_class.find_field_by_name(reference_key).try(:name) ||
-          target_class.identity.try(:name)
+            target_class.find_field_by_name(reference_key).try(:name) ||
+            target_class.identity.try(:name)
         end
 
         # Append a model or array of models to the relation. Will set the owner
@@ -47,7 +47,7 @@ module Filemaker
           end
           self
         end
-        alias_method :push, :<<
+        alias push <<
 
         # def concat(docs)
         #   # TODO: Find out how to do batch insert in FileMaker

data/lib/filemaker/model/relations/proxy.rb

@@ -27,7 +27,11 @@ module Filemaker
         end
 
         def method_missing(name, *args, &block)
-          target.send(name, *args, &block)
+          target.send(name, *args, &block) || super
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          super
         end
       end
     end

data/lib/filemaker/model/selectable.rb

@@ -7,8 +7,11 @@ module Filemaker
       #
       # @return [Filemaker::Model::Criteria]
       def where(criterion)
-        raise Filemaker::Errors::MixedClauseError,
-              "Can't mix 'where' with 'in'." if chains.include?(:in)
+        if chains.include?(:in)
+          raise Filemaker::Errors::MixedClauseError,
+                "Can't mix 'where' with 'in'."
+        end
+
         chains.push(:where)
         chains.delete(:in)
 
@@ -55,8 +58,11 @@ module Filemaker
 
       %w(eq cn bw ew gt gte lt lte neq).each do |operator|
         define_method(operator) do |criterion, &block|
-          raise Filemaker::Errors::MixedClauseError,
-                "Can't mix 'where' with 'in'." if chains.include?(:in)
+          if chains.include?(:in)
+            raise Filemaker::Errors::MixedClauseError,
+                  "Can't mix 'where' with 'in'."
+          end
+
           chains.push(operator.to_sym)
           chains.push(:where) unless chains.include?(:where) # Just one time
           chains.delete(:in)
@@ -81,11 +87,11 @@ module Filemaker
         end
       end
 
-      alias_method :equals, :eq
-      alias_method :contains, :cn
-      alias_method :begins_with, :bw
-      alias_method :ends_with, :ew
-      alias_method :not, :neq
+      alias equals eq
+      alias contains cn
+      alias begins_with bw
+      alias ends_with ew
+      alias not neq
 
       # Find records based on FileMaker's compound find syntax.
       #
@@ -99,15 +105,18 @@ module Filemaker
       #
       # @return [Filemaker::Model::Criteria]
       def in(criterion, negating = false)
-        raise Filemaker::Errors::MixedClauseError,
-              "Can't mix 'in' with 'where'." if chains.include?(:where)
+        if chains.include?(:where)
+          raise Filemaker::Errors::MixedClauseError,
+                "Can't mix 'in' with 'where'."
+        end
+
         chains.push(:in)
         chains.delete(:where)
         @selector ||= []
 
         become_array(criterion).each do |hash|
           accepted_hash = klass.with_model_fields(hash)
-          accepted_hash.merge!('-omit' => true) if negating
+          accepted_hash['-omit'] = true if negating
           @selector << accepted_hash
         end
 
@@ -138,8 +147,11 @@ module Filemaker
       #
       # @return [Filemaker::Model::Criteria]
       def or(criterion)
-        raise Filemaker::Errors::MixedClauseError,
-              "Can't mix 'or' with 'in'." if chains.include?(:in)
+        if chains.include?(:in)
+          raise Filemaker::Errors::MixedClauseError,
+                "Can't mix 'or' with 'in'."
+        end
+
         @selector ||= {}
         selector.merge!(klass.with_model_fields(criterion))
         options[:lop] = 'or'

data/lib/filemaker/railtie.rb

@@ -6,11 +6,11 @@ module Rails
       initializer 'filemaker-load-config-yml' do
         config_file = Rails.root.join('config', 'filemaker.yml')
 
-        if config_file.file?
-          ::Filemaker.load!(config_file, Rails.env)
-        else
+        unless config_file.file?
           raise ::Filemaker::Errors::ConfigurationError, 'No config file'
         end
+
+        ::Filemaker.load!(config_file, Rails.env)
       end
     end
   end

data/lib/filemaker/record.rb

@@ -77,7 +77,7 @@ module Filemaker
 
     def normalize_data(datum)
       return nil if datum.empty?
-      (datum.size == 1) ? datum.first : datum
+      datum.size == 1 ? datum.first : datum
     end
 
     def method_missing(symbol, *args, &block)
@@ -86,5 +86,9 @@ module Filemaker
       return @dirty[$`] = args.first if method =~ /(=)$/ && key?($`)
       super
     end
+
+    def respond_to_missing?
+      super
+    end
   end
 end

data/lib/filemaker/resultset.rb

@@ -79,7 +79,7 @@ module Filemaker
     def size
       list.size
     end
-    alias_method :length, :size
+    alias length size
 
     private
 

data/lib/filemaker/server.rb

@@ -11,8 +11,8 @@ module Filemaker
 
     # @return [Filemaker::Store::DatabaseStore] the database store
     attr_reader :databases
-    alias_method :database, :databases
-    alias_method :db, :databases
+    alias database databases
+    alias db databases
 
     def_delegators :@config, :host, :url, :ssl, :endpoint, :log
     def_delegators :@config, :account_name, :password
@@ -168,8 +168,6 @@ module Filemaker
       when :simple    then log_simple(params)
       when :curl      then log_curl(params)
       when :curl_auth then log_curl(params, true)
-      else
-        return
       end
     end
 
@@ -188,7 +186,7 @@ module Filemaker
     end
 
     def log_simple(params)
-      warn "#{endpoint}?#{log_params(params)}"
+      warn colorize('48;2;255;0;0', "#{endpoint}?#{log_params(params)}")
     end
 
     def log_params(params)
@@ -196,5 +194,9 @@ module Filemaker
         "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
       end.join('&')
     end
+
+    def colorize(color, message)
+      "\e[#{color}m#{message}\e[0m"
+    end
   end
 end

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.17'.freeze
+  VERSION = '0.0.18'.freeze
 end

data/spec/filemaker/metadata/field_spec.rb

@@ -36,6 +36,18 @@ describe Filemaker::Metadata::Field do
       expect(field.coerce('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
+    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
+    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

data/spec/support/models.rb

@@ -57,7 +57,10 @@ class MyModel
   belongs_to :applicant, class_name: User, reference_key: :name
   belongs_to :member
   belongs_to :manager, source_key: :mg_id
-  belongs_to :another_manager, class_name: Manager, source_key: :mg_id, reference_key: :candidate_id
+  belongs_to :another_manager,
+             class_name: Manager,
+             source_key: :mg_id,
+             reference_key: :candidate_id
   has_many :posts
   has_many :posters, class_name: User, reference_key: :email
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,16 +42,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper to FileMaker XML API.
@@ -287,4 +287,3 @@ test_files:
 - spec/support/responses/portal.xml
 - spec/support/responses/scriptnames.xml
 - spec/support/xml_loader.rb
-has_rdoc: