orm_adapter-fmrest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e19c15e6fcc08c53a32510c1a98c5dc66271f5d00143c5b5cc18ac30717f51f
-  data.tar.gz: c123ee2e3d1fca48ac771444f8b710fd5cb1f5cf8a6903af41578fb5cd60ebad
+  metadata.gz: 524ca147efac8a6e7f996e3a1f44bf70471d276c396abc56de75dbbfcdde05da
+  data.tar.gz: 0aad80bcbc591b7055f3efefd05629219ace7f3444f16da107cfcaa737e852e4
 SHA512:
-  metadata.gz: c5e22129ff41cbf904e0f74182917eaf471bc7cda2356768ccf2ec046a5d1107154eb5dc2921b944c95a2c5f01ee484e6da1ed247e677bc7aef30efcbe1e6b4c
-  data.tar.gz: 876ded434edf728ab5237547dcb5f148eeaea321bad7ed9fb62bc24fc5e0a164b5f8e06fed4395ed2b174650cef2d90683b053ed198a1e8f9edfbe87a0b8025b
+  metadata.gz: 462edd4b1892bbc3c533fd2c9b6bed12c6cea4e3967cc726e28acd793167b7fbc8f84e03dd5bb6b147e662baf25e580a1cafe504b06d8fe347f239eabbb171fc
+  data.tar.gz: d833a66bf2eca2ceb86b050bde9415f98792ac175cd3fcaf4787c3df9bbc5c15015587c79c8b3d09e4dc500946c18c41e3dbb4926b5ce5e45b88ba46e43e77bc

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## CANGELOG
+
+### 0.1.1
+
+* fix find_first without condition
+* add usage with Devise in README
+* auto map columns from layout for Devise models
+
+### 0.1.0
+
+* initial commit

data/README.md

@@ -48,7 +48,6 @@ gem 'devise'
 And then configure Devise using "--orm fmrest" parameter:
 
     $ rails generate devise:install --orm fmrest
-    $ rails generate devise User --orm fmrest
 
 After that you can create User model:
 
@@ -56,8 +55,10 @@ After that you can create User model:
 class User < FmRest::Layout
   layout('your_user_layout')
   extend Devise::Models
-  devise :database_authenticatable, :rememberable, :trackable
+  include ActiveModel::Validations
+  include ActiveModel::Validations::Callbacks
 
+  devise :database_authenticatable, :rememberable, :trackable
 
 end
 ```

data/lib/devise/orm/fmrest.rb

@@ -1 +1,2 @@
-# stub to enable devise to use orm_adapter-fmrest
+# stub to enable devise to use orm_adapter-fmrest
+require 'orm_adapter/fmrest'

data/lib/orm_adapter/fmrest/adapter.rb

@@ -8,6 +8,15 @@ module FmRest
     class Base
       extend OrmAdapter::ToAdapter
 
+      # for device models define all unmapped columns in column map so they can be accessed
+      def initialize(attributes = nil)
+        super
+        return unless self.class.respond_to? :authentication_keys
+
+        base_columns = self.class.to_adapter.column_names - mapped_attributes.keys
+        self.class.attributes(base_columns.to_h {|col| [col, col]})
+      end
+
       class OrmAdapter < ::OrmAdapter::Base
 
         # Get a list of the attribute names (field names) in the Filemaker Layout.
@@ -88,8 +97,9 @@ module FmRest
         def base_relation(options)
           conditions, order, limit, offset = extract_conditions!(options)
 
-          relation = klass.query(exact_conditions(conditions))
-          relation = relation.sort(*order_clause(order)) if order.any?
+          relation = klass
+          relation = klass.query(exact_conditions(conditions.stringify_keys)) if conditions.present?
+          relation = relation.sort(*order_clause(order)) if order.present?
           relation = relation.limit(limit) if limit
           relation = relation.offset(offset) if offset
 
@@ -97,7 +107,7 @@ module FmRest
         end
 
         def exact_conditions(conditions)
-          conditions.transform_values { |v| v.is_a?(String) ? "==#{v}" : v }
+          conditions.transform_values { |v| v.is_a?(String) && !v.match?(/^[<=>]/) ? "==#{v}" : v }
         end
 
         def order_clause(order)
@@ -106,6 +116,8 @@ module FmRest
 
         # given an order argument, returns an array of attributes (symbols) postfixed with __desc if order is reversed
         def normalize_order(order)
+          return if order.blank?
+
           if order.is_a? Array
             order = [order] unless order.first.is_a?(Array)
             order.map { |key, dir| (dir.to_s.downcase == 'desc' ? "key__desc" : key).to_sym }

data/lib/orm_adapter/fmrest/version.rb

@@ -1,5 +1,5 @@
 module OrmAdapter
   module Fmrest
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/orm_adapter-fmrest.gemspec

@@ -37,8 +37,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemodel', '>= 3.0.0', '< 7.0.0'
   spec.add_dependency 'activesupport', '>= 3.0.0', '< 7.0.0'
-  spec.add_dependency 'orm_adapter', '>= 0.5.0'
-  spec.add_dependency 'fmrest', '>= 0.18.0'
+  spec.add_dependency 'orm_adapter', '~> 0.5', '>= 0.5.0'
+  spec.add_dependency 'fmrest', '~> 0.18'
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orm_adapter-fmrest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Meier
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -57,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,20 +67,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: fmrest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +126,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - martin@itcmeier.de
 executables: []
@@ -129,6 +135,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -147,7 +154,7 @@ metadata:
   homepage_uri: https://github.com/mameier
   source_code_uri: https://github.com/mameier/orm_adapter-fmrest
   changelog_uri: https://github.com/mameier/orm_adapter-fmrest/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Adds Filemaker Rest to the orm_adaptor project.
 test_files: []