tenon 1.0.70 → 1.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0378db22c299a6f50d59da184cfd040fb19d2364
-  data.tar.gz: dcb735d06fcca9fc5c77fe4b9694874941680174
+  metadata.gz: 9054c2cac1e7a21ec64187a6684a550f56529f2a
+  data.tar.gz: 392e62837098704cc4be1f177cbe97bb9df30f13
 SHA512:
-  metadata.gz: acf0858902b9a2afe44b482e1e629eb729dd35061ab3a6b36daef38dde3a8aea9032485d4155b061f475ba1931c5777155b1410bc0e85b381bf8b18a491316e3
-  data.tar.gz: 5ace0cfa567211b1d4044493f61ef67b5d3a256d6c02898ece0738c347b669b1335aa99e56a739f0359335ff909fb3a5a49e8e8e83931dab28eacca1ba382fc1
+  metadata.gz: bd28979cacc3f82a933a3d71e80a4a358805724381be2c0a18ef4b120a0f9ccd4940bf7dac7b28fe1b9815a8db2bc4e5e971c84b1910b5741a2ae9d1a08ad2ed
+  data.tar.gz: de00cba8698248740d9379a1a482a75bb2aad45675a2d41fdfe409c3d3fd5c3c1d90d90f9a0111c58bcd556cb5eae365db5c90ae510dfc3d7fcf4436cc610c74

data/lib/tenon/i18n_lookup.rb

@@ -1,11 +1,11 @@
 module Tenon
   class I18nLookup
     def initialize(klass)
-      @klass = klass
+      @klass = klass.to_s.sub /Decorator\z/, ''
     end
 
     def fields
-      self.class.fields[:tables][@klass.to_s.underscore.pluralize.to_sym] || []
+      self.class.fields[:tables][@klass.underscore.pluralize.to_sym] || []
     end
 
     def self.fields

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.70'
+  VERSION = '1.0.71'
 end

data/spec/features/tenon/comments_spec.rb

@@ -32,17 +32,17 @@ describe 'An admin viewing the comments index', js: true do
             expect(page).to have_selector("a.toggle.#{action}.true")
           end
         end
+      end
 
-        context "if #{action} is true" do
-          it "should be able to toggle #{action} to false" do
-            comment.update_attributes(action.to_sym => true)
-            visit comments_path
-            within('ul#comments') do
-              expect(page).to have_selector("a.toggle.#{action}.true")
-              page.find("a.toggle.#{action}").click
-              expect(comment.reload.send("toggle_#{action}!")).to be_true
-              expect(page).to have_selector("a.toggle.#{action}.false")
-            end
+      context "if #{action} is true" do
+        it "should be able to toggle #{action} to false" do
+          comment.update_attributes(action.to_sym => true)
+          visit comments_path
+          within('ul#comments') do
+            expect(page).to have_selector("a.toggle.#{action}.true")
+            page.find("a.toggle.#{action}").click
+            expect(comment.reload.send("toggle_#{action}!")).to be_true
+            expect(page).to have_selector("a.toggle.#{action}.false")
           end
         end
       end

data/spec/features/tenon/i18n_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+include RequestHelpers
+
+describe 'An admin', js: true do
+  let!(:admin) { create(:admin) }
+
+  before do
+    login(admin)
+  end
+
+  # When a Tenon app is configured to use i18n, and a particular model is set
+  # up to have fields that are internationalized, then a Tenon user should
+  # see a "Locale" nav in the sidebar of the model form.
+  # EG, if posts are
+  # supposed to have an English title and a French title, when they add a
+  # post they will see a navigation item in the sidebar with two elements
+  # that say "English" and "French".
+  #
+  # Clicking these nav elements will show or hide the internationalized fields.
+  # The tests below make sure that these fields are rendered in the HTML
+  #
+  # However, there is a certain amount of configuration that is involved in
+  # making this stuff work, which is relevant only to these tests, and also
+  # happens to break stuff in other, non-internationalized tests.  Therefore,
+  # we have all the setup and teardown below (see before(:all) and after(:all)
+  # respectively).
+  #
+  # We are using Tenon::Post as a test model, but this should work with any
+  # kind of model.
+
+  describe 'visiting a form with i18n fields' do
+    let!(:post) { create(:post) }
+
+    before(:all) do
+      # reset the Tenon:I18nLookup so that we use the thing defined in the
+      # spec/dummy app
+      Tenon::I18nLookup.class_variable_set :@@fields, nil
+
+      # We need to set up Tenon to tell it what languages it supports.  We'll
+      # reset it below in after(:all)
+      @orig_languages = Tenon.config.languages
+      Tenon.config.languages = { "French" => :fr }
+
+      # Now that we've changed the langugages, we need to reload Tenon::Post
+      # so that the "tenon_content :content, i18n: true" call re-fires
+      # (otherwise, "association not found" errors happen)
+      reload "app/models/tenon/post.rb"
+
+      # Next we need to add the internationalized fields to the database so that
+      # we can save the post when we try to test the create / update views. We
+      # don't want to add a migration like that to the database, so we add it
+      # manually and reset the column info in Tenon::Post.
+      unless ActiveRecord::Base.connection.column_exists?(:tenon_posts, :title_fr)
+        ActiveRecord::Base.connection.add_column :tenon_posts, :title_fr, :string
+      end
+      Tenon::Post.reset_column_information
+    end
+
+    context 'visiting the #new action' do
+      it 'should render the i18n fields' do
+        visit new_post_path
+        expect(page).to have_css "input#post_title_fr"
+      end
+    end
+
+    context 'visiting the #create action' do
+      it 'should render the i18n fields' do
+        visit new_post_path
+        # don't need the post to save properly, just need to see the create page
+        click_button 'Save'
+        expect(page).to have_css "input#post_title_fr"
+      end
+    end
+
+    context 'visiting the #edit action' do
+      it 'should render the i18n fields' do
+        visit edit_post_path(post)
+        expect(page).to have_css "input#post_title_fr"
+      end
+    end
+
+    context 'visiting the #update action' do
+      it 'should render the i18n fields' do
+        visit edit_post_path(post)
+        click_button 'Save'
+        expect(page).to have_css "input#post_title_fr"
+      end
+    end
+
+    after(:all) do
+      # remove the added column
+      ActiveRecord::Base.connection.remove_column :tenon_posts, :title_fr
+      Tenon::Post.reset_column_information
+
+      # reset the languages Tenon is using
+      Tenon.config.languages = @orig_languages
+
+      # reload Tenon::Post
+      reload 'app/models/tenon/post.rb'
+    end
+  end
+end
+
+def reload(file_name)
+  load File.dirname(__FILE__) + '/../../../' + file_name
+end

data/spec/lib/tenon/i18n_lookup_spec.rb

@@ -2,9 +2,18 @@ require 'spec_helper'
 
 describe Tenon::I18nLookup do
   describe '.new' do
-    it 'should assign @klass' do
-      i = Tenon::I18nLookup.new(String)
-      expect(i.instance_variable_get('@klass')).to eq(String)
+    context "when the given class is a Decorator" do
+      it 'assigns the decorated class.to_s to @klass' do
+        i = Tenon::I18nLookup.new(Tenon::Post.new.decorate.class)
+        expect(i.instance_variable_get('@klass')).to eq(Tenon::Post.new.class.to_s)
+      end
+    end
+
+    context "when the given class is not a Decorator" do
+      it 'assigns class.to_s to @klass' do
+        i = Tenon::I18nLookup.new(String)
+        expect(i.instance_variable_get('@klass')).to eq(String.to_s)
+      end
     end
   end
 
@@ -48,7 +57,13 @@ describe Tenon::I18nLookup do
       end
 
       it 'should load the YAML' do
-        expect(YAML).to receive(:load) { {} }
+        # for the love of Christ, make sure that the loaded YAML is a real
+        # representative of the file when loaded!
+        # alternatively, reload this with real data when done!
+        # MLK spent a shit-ton of time trying to fix testing errors caused
+        # by this:
+        # expect(YAML).to receive(:load) { {} }
+        expect(YAML).to receive(:load) { { tables: {} } }
         Tenon::I18nLookup.fields
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.70
+  version: 1.0.71
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1420,6 +1420,7 @@ files:
 - spec/features/tenon/contacts_spec.rb
 - spec/features/tenon/events_spec.rb
 - spec/features/tenon/galleries_spec.rb
+- spec/features/tenon/i18n_spec.rb
 - spec/features/tenon/pages_spec.rb
 - spec/features/tenon/post_categories_spec.rb
 - spec/features/tenon/posts_spec.rb
@@ -1506,7 +1507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.
@@ -1535,6 +1536,7 @@ test_files:
 - spec/features/tenon/contacts_spec.rb
 - spec/features/tenon/events_spec.rb
 - spec/features/tenon/galleries_spec.rb
+- spec/features/tenon/i18n_spec.rb
 - spec/features/tenon/pages_spec.rb
 - spec/features/tenon/post_categories_spec.rb
 - spec/features/tenon/posts_spec.rb