filemaker 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d84b6982396ee09d4e78ae0d12be8fbb4ca3b69
-  data.tar.gz: 8a758a58c2b0462e8b34ec246b6aae68b70ca750
+  metadata.gz: 313d37cb07a852df689318962b7161ef284e513d
+  data.tar.gz: a756e6010205d399622e87ec6c701645b817da90
 SHA512:
-  metadata.gz: cd8c34c33807e773c6f3bff976e1b095e35dd18e89e877da8f905af484d3d78b3765f6ac32c8770048f24ed993a3f24428b86a6de342cd79e439d377e586516f
-  data.tar.gz: cf8aa8ec4943ff7497387d5aa5f61c0a29b598dfa15a1d85f3cdbbdfd935ef732a75b9ac9b2110467c5f2afff09c671dd80464efee01856d637335e3f8ffbe53
+  metadata.gz: fc6aba202bd692e1a6502b16a7c867cee392e15bccd595e1d171f30063daf88b9c5e987e8d7286ac6b8b48a1bd6fb14abfb2f975fc11247c07901c97ba4b5cd7
+  data.tar.gz: 572d07b1406c44351d15cffd124d8b044a81b1c2aba5c05d7e6e6e8c8ced8574d75c2968e1d3282b2d32d601be89fcb8daeadfbf9ed0083aff9353c35a58a72c

data/README.md

@@ -24,7 +24,7 @@ Configuration for initializing a server:
 * `account` - Please use `ENV` variable like `ENV['FILEMAKER_ACCOUNT']`
 * `password` - Please use `ENV` variable like `ENV['FILEMAKER_PASSWORD']`
 * `ssl` - Use `{ verify: false }` if you are using FileMaker's unsigned certificate. You can also pass a hash which will be forwarded to Faraday directly like `ssl: { client_cert: '', client_key: '', ca_file: '', ca_path: '/path/to/certs', cert_store: '' }`. See [Setting up SSL certificates on the Faraday wiki](https://github.com/lostisland/faraday/wiki/Setting-up-SSL-certificates)
-* `log` - A choice of `:simple`, `:curl` and `:curl_auth`. 
+* `log` - A choice of `:simple`, `:curl` and `:curl_auth`.
 
 ```ruby
 server = Filemaker::Server.new do |config|
@@ -65,20 +65,30 @@ Most API will be smart enough to reject invalid query parameters if passed in in
 
 If you want ActiveModel-like access with a decent query DSL like `where`, `find`, `in`, you can include `Filemaker::Model` to your model. Your Rails form will work as well as JSON serialization.
 
+The following data types can be used to register the fields: `string`, `integer`, `money`, `date` and `datetime`. If the field name has spaces, you can use `fm_name` to identify the real FileMaker field name.
+
+```ruby
+string :job_id, fm_name: 'JobOrderID', identity: true
+```
+
+You can also use 3 relations: `has_many`, `belongs_to` and `has_portal`.
+
+`has_many` will refer to the model's own identity as the reference key while `belongs_to` will append `_id` for the reference key.
+
 ```ruby
 class Job
   include Filemaker::Model
 
   database :jobs
   layout :job
-  
+
   paginates_per 50
 
   # Taken from filemaker.yml config file, default to :default
   # Only use registry if you have multiple FileMaker servers you want to connect
   registry :read_slave
 
-  string   :job_id, fm_name: 'JobOrderID', id: true
+  string   :job_id, fm_name: 'JobOrderID', identity: true
   string   :title, :requirements
   datetime :created_at
   datetime :published_at, fm_name: 'ModifiedDate'
@@ -96,9 +106,9 @@ end
 
 development:
   default:
-    host: localhost
-    account_name: ENV['FILEMAKER_ACCOUNT_NAME']
-    password: ENV['FILEMAKER_PASSWORD']
+    host: <%= ENV['FILEMAKER_HOSTNAME'] %>
+    account_name: <%= ENV['FILEMAKER_ACCOUNT_NAME'] %>
+    password: <%= ENV['FILEMAKER_PASSWORD'] %>
     ssl: true
     log: :curl
 
@@ -178,9 +188,13 @@ Model.not_in([{ name: 'Lee' }, { age: '< 40' }])
 Model.in(nationality: %w(Singapore Malaysia)).not_in(name: 'Lee', age: '< 40')
 ```
 
+Note: It is vitally important that you get the order right for mixing in the use of `in` with `not_in`. Likely you will want to do an `in` first to be inclusive and later omit using `not_in`.
+
 - [x] Please test the above query with real data to ensure correctness!
 - [x] Please test the comparison operators with keyword as well as applied to value.
 - [x] Test serialization of BigDecimal and other types.
+- [ ] Caching of relation models
+- [ ] Test the order for `in` and `not_in` found set accuracy.
 
 ## Pagination
 
@@ -197,9 +211,8 @@ class Job
 
   database :jobs
   layout :job
-  
-  paginates_per 50
 
+  paginates_per 50
 end
 
 Job.per_page # => 50

data/filemaker.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'pry-byebug'
 end

data/lib/filemaker/model/criteria.rb

@@ -89,7 +89,7 @@ module Filemaker
         models = Filemaker::Model::Builder.collection(resultset, klass)
 
         if defined?(Kaminari) && paginated
-          Kaminari.paginate_array(models, resultset.count)
+          Kaminari.paginate_array(models, total_count: resultset.count)
             .page(@_page)
             .per(options[:max])
         else

data/lib/filemaker/model/selectable.rb

@@ -46,9 +46,9 @@ module Filemaker
       def recid(id)
         return nil if id.blank?
 
-        @selector ||= {}
+        @selector = {} # We want to clear the selector when it comes to recid
         selector['-recid'] = id
-        chains.push(:where)
+        chains.push(:where) unless chains.include?(:where) # No double :where
         first
       end
 

data/lib/filemaker/railtie.rb

@@ -7,9 +7,9 @@ module Rails
         config_file = Rails.root.join('config', 'filemaker.yml')
 
         if config_file.file?
-          Filemaker.load!(config_file, Rails.env)
+          ::Filemaker.load!(config_file, Rails.env)
         else
-          fail Error::ConfigurationError, 'No config file provided'
+          fail ::Filemaker::Error::ConfigurationError, 'No config file provided'
         end
       end
     end

data/lib/filemaker/record.rb

@@ -16,6 +16,7 @@ module Filemaker
       @record_id = record['record-id']
       @portals   = HashWithIndifferentAndCaseInsensitiveAccess.new
       @dirty     = {} # Keep track of field modification
+      @ready     = false
 
       record.xpath('field').each do |field|
         # `field` is Nokogiri::XML::Element

data/lib/filemaker/server.rb

@@ -182,7 +182,7 @@ module Filemaker
       auth = " -H 'Authorization: #{@connection.headers['Authorization']}'" if \
         has_auth
 
-      warn 'Pretty print like so: `curl XXX | xmllint --format -`'
+      # warn 'Pretty print like so: `curl XXX | xmllint --format -`'
       warn "curl -XGET '#{full_url}'#{curl_ssl_option} -i#{auth}"
     end
 

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/spec/filemaker/model/criteria_spec.rb

@@ -41,6 +41,21 @@ describe Filemaker::Model::Criteria do
       end
     end
 
+    describe 'find' do
+      it 'resets the selector and will not double :where' do
+        allow(criteria).to receive(:first).and_return(nil)
+        criteria.find(12)
+        expect(criteria.selector).to eq({ '-recid' => 12 })
+        expect(criteria.chains).to eq [:where]
+      end
+
+      it 'will use the identity to find' do
+        allow(criteria).to receive(:first).and_return([])
+        criteria.find(22)
+        expect(criteria.selector).to eq({ 'ca id' => '=22' })
+      end
+    end
+
     describe 'or' do
       it 'chains `or` as logical OR option' do
         criteria.where(name: 'Bob').or(email: 'bob@cern.org')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement