sequel-rails 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e8c4d115890eb4b68cf24fa551a13a0d9dc1f0
-  data.tar.gz: eebe30d28b9279cdab91af9718dbc7a655b3d3de
+  metadata.gz: da3053022759b50cd6a007f51516a58bc8c7f81c
+  data.tar.gz: 4b973b667f554d668de301170030b8038fad9ac1
 SHA512:
-  metadata.gz: cc726e214a6c3c511ca9475a87125650c755f436053ee9b4496ddc4b13d145c2f44f23184faf2963bb7abe3363596e93a62c26bf2bc679e95d148ff2c2c1fd0c
-  data.tar.gz: 809c17b658f92fab40398b87d079b109dbd51ab0b499f279876b59740c03d3baa9cd7970716f25946e18e586b65d0d18e89b15cbc8f941aa665cd729c0656f2e
+  metadata.gz: 3ff5816b3bfb73dc0e45a4332c978f134bcb51fd0fb58b3897ae6b4399f20691ec49fe202f2fb0cb685b4538605013c6c863cb53347263a85e486b4fb72442e8
+  data.tar.gz: c7625430e3807d77cc054da4fe6b27d408d43dc53a7bd9b619d9afe14bbfaff7e0e0a8f76485ca063d277a39f7cd30637061745929f3f098e54a03998d2023b5

data/.rubocop.yml

@@ -8,6 +8,7 @@ AllCops:
     - '**/*.gemspec'
   Exclude:
     - 'lib/sequel-rails.rb'
+    - 'ci/*'
 
 HashSyntax:
   EnforcedStyle: hash_rockets

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
   - ree
   - 1.8.7

data/History.md

@@ -1,3 +1,9 @@
+0.9.7 (2014-12-18)
+==================
+
+* Fix ActiveModel I18n integration (Nico Rieck) [#77](https://github.com/TalentBox/sequel-rails/pull/77)
+* Improve CI speed by using docker and caching on Travis
+
 0.9.6 (2014-11-30)
 ==================
 

data/README.md

@@ -348,6 +348,7 @@ Improvements has been made by those awesome contributors:
 * shelling (shelling)
 * a3gis (a3gis)
 * Andrey Chernih (andreychernih)
+* Nico Rieck (gix)
 
 Credits
 =======

data/lib/sequel_rails/railtie.rb

@@ -70,7 +70,8 @@ module SequelRails
     end
 
     def setup_i18n_support
-      ::Sequel::Model.send :include, ::SequelRails::I18nSupport
+      ::Sequel::Model.send :extend, ::ActiveModel::Translation
+      ::Sequel::Model.send :extend, ::SequelRails::I18nSupport
     end
 
     def setup_controller_runtime

data/lib/sequel_rails/railties/i18n_support.rb

@@ -4,5 +4,11 @@ module SequelRails
     def i18n_scope #:nodoc:
       :sequel
     end
+
+    def lookup_ancestors
+      # ActiveModel uses the name of ancestors. Exclude unnamed classes, like
+      # those returned by Sequel::Model(...).
+      super.reject { |x| x.name.nil? }
+    end
   end
 end

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -56,7 +56,9 @@ describe SequelRails::Railtie do
   end
 
   it 'configures Sequel::Model instances for i18n' do
-    expect(User.new.i18n_scope).to be(:sequel)
+    expect(User.i18n_scope).to be(:sequel)
+    expect(User).to respond_to(:lookup_ancestors)
+    expect(User.model_name.human).to eq('translated user')
   end
 
   it 'adds Sequel runtime to controller for logging' do

data/spec/spec_helper.rb

@@ -20,6 +20,16 @@ rspec_exclusions[:sqlite] = ENV['TEST_ADAPTER'] != 'sqlite3'
 
 RSpec.configure do |config|
   config.filter_run_excluding rspec_exclusions
+
+  config.before(:all) do
+    I18n.backend.store_translations(
+      :en,
+      'sequel' => {
+        'models' => {
+          'user' => 'translated user' }
+      })
+  end
+
   config.around :each do |example|
     if example.metadata[:no_transaction]
       example.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel