banyan 1.0.1 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYxYzEyOGNkYmZhN2MzZjJlZGFlMmYxMmY0M2ZiODBhYWRjNmYyYQ==
+    N2EzZjI3OWRmMjg2ZmNlNmUzY2U3NWQxYmQ2MDRmNTIyNmQ5NzY4ZA==
   data.tar.gz: !binary |-
-    OTg5ZTE3MzRlOTg4YWUzNTJkZWNhMGMzMWI4N2Q2NWZhOThlMjdjOQ==
+    ZmI1MzIzMzQwYmY2ZjdkYzQ2MGQ0N2NjZWNkYTg3YTU2OWE5OTY4Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjBjNzVjOTQyMWZkMTJkNjZkYmVhZmE5N2M0ZWU4NjJlZGE3MDk3NjRlMmZk
-    ZWExZDRjNjVmMjAxYjIwYjEwYTBkOTdlNWM3YmNhNmUwMTM3YTBhOGQzZmE1
-    MDJlMmRhNmQ2Y2IzMzA2YTYwYmFhNWVhNjc0YWE3M2EyOTVjZWM=
+    OWE3MGFiZmZhYWYxMWUyNzliZTNkNzhmZDdlNzAxMzBiYzY0OWQxNGE3N2Mz
+    MmUxMzA0NTZmNGEyNTk4MDQzNDBhZGM0YmVhZmFmZWEyOWU1OTE0ZDE4NjY0
+    Mjc1OWI1MDMxMzU2MzdkYzJmYzE4OWYyNDA1OWMwMDg1N2VjOWE=
   data.tar.gz: !binary |-
-    MjM3OTNmODAyNTEzYzRlZDU1YTZiOGM3YjE3YzFmODJhZjA2ZDg4OGFkYjZi
-    NGI0MmYxZGY1Y2U1ZGJlNGYyNmJjZTZkMjhhMjVkOGQ3M2E0ZDY1Y2U1N2Fl
-    MmM1NzUyM2FkNDJhMmVlNjk5ZDM0NWQ1OWNlMjg2NWU2YjZhNzQ=
+    NjI5ZTgxNjEyNjFmZmQ3MGZjZGJhN2M1ZGRjNjA4OTE4ZjhhNzhhMjU2YTNi
+    NjEyNWY3MGM4ZDNmYWIxYTI2NDY3YjRlMDMzMjg3NmM3ZDMyMmM1MThkMWZj
+    NzRkZTFkMGQ1YjU2MmMwYjI0MGRjODc0ZTUxYmFjYWVjZTg4ZTk=

data/.gitignore

@@ -1 +1,3 @@
 Gemfile.lock
+pkg
+tmp

data/Rakefile

@@ -9,4 +9,7 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => :spec
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
+
+task :default => [:spec,:features]

data/banyan.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 3.0'
   s.add_dependency 'globalize3', '~> 0.3'
   s.add_dependency 'awesome_nested_set', '~> 2.0'
-  s.add_development_dependency 'sqlite3', '~> 1.3'
-  s.add_development_dependency 'rspec-rails', '~> 2.6'
-  s.add_development_dependency 'factory_girl', '~> 4.2'
+  s.add_development_dependency 'aruba', '~> 0.5'
   s.add_development_dependency 'database_cleaner', '< 1.1.0'
+  s.add_development_dependency 'factory_girl', '~> 4.2'
+  s.add_development_dependency 'rspec-rails', '~> 2.6'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/features/step_definitions/translation_import_and_export_steps.rb

@@ -0,0 +1,79 @@
+Given /^I setup a new rails app "([^"]*)"$/ do |app|
+  run_simple("rails new #{app} -d mysql")
+  cd app
+end
+
+Given /^I install banyan$/ do
+  run_simple("bundle exec rake db:create", true)
+  run_simple("rails g banyan", true)
+  run_simple("bundle exec rake db:migrate", true)
+end
+
+Then /^the file "([^"]*)" should be valid yaml$/ do |file|
+  expect do
+    in_current_dir do
+      YAML::load_file(file)
+    end
+  end.to_not raise_error
+end
+
+Given /^I seed the database with Categories:$/ do |table|
+  in_current_dir do
+    File.open("db/seeds.rb", 'w+') do |file|
+      table.hashes.each do |row|
+        file.puts("category = Banyan::Category.create!(tag: #{row['tag'].inspect}, name: #{row['name'].inspect})")
+      end
+    end
+  end
+
+  run_simple("bundle exec rake db:seed", true)
+end
+
+Given /^I seed the database with Groups:$/ do |table|
+  in_current_dir do
+    File.open("db/seeds.rb", 'w+') do |file|
+      table.hashes.each do |row|
+        file.puts("category_group = Banyan::CategoryGroup.create!(tag: #{row['tag'].inspect}, name: #{row['name'].inspect})")
+      end
+    end
+  end
+
+  run_simple("bundle exec rake db:seed", true)
+end
+
+Given /^"a file named "([^"]*)" with:"$/ do |filename, hash|
+  in_current_dir do
+    File.open(filename, "w") do |f|
+      f.puts(yaml(hash))
+    end
+  end
+end
+
+Given /^I translate "([^"]*)" to "([^"]*)" into "([^"]*)"$/ do |path, value, filename|
+  in_current_dir do
+    categories, language, tag = path.split('.')
+
+    patch_hash = {categories => {language => {tag => value}}}
+
+    ydata = YAML.load_file(filename)
+
+    deep_merge_strategy = lambda do |conflicted_key, receiver_value, argument_value|
+      case receiver_value when Hash
+        case argument_value when Hash
+          receiver_value.merge(argument_value,&deep_merge_strategy)
+        else
+          argument_value
+        end
+      else
+        argument_value
+      end
+    end
+
+    ydata.merge!(patch_hash,&deep_merge_strategy)
+
+    File.open(filename, "w") do |f|
+      f.puts(ydata.to_yaml)
+    end
+  end
+end
+

data/features/support/env.rb

@@ -0,0 +1,11 @@
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 24
+end
+
+After("@rails-app") do
+  in_current_dir do
+    run_simple("bundle exec rake db:drop", true)
+  end
+end

data/features/translation_import_and_export.feature

@@ -0,0 +1,89 @@
+@disable-bundler @rails-app
+Feature: Facilitating translation of Banyan Categories
+
+  Background:
+    Given I setup a new rails app "dummy"
+    And I append to "Gemfile" with:
+      """
+        gem 'banyan', path: "../../.."
+      """
+    And a file named "config/environment.rb" with:
+      """
+        Encoding.default_external = Encoding::UTF_8
+        Encoding.default_internal = Encoding::UTF_8
+        # Load the rails application
+        require File.expand_path('../application', __FILE__)
+        # Initialize the rails application
+        Dummy::Application.initialize!
+      """
+    And I successfully run `bundle install` for up to 24 seconds
+    And I install banyan
+    And a file named "config/locales/de.yml" with:
+      """
+        de:
+          hello: hallo
+      """
+    And a file named "config/locales/fr.yml" with:
+      """
+        fr:
+          hello: bonjour
+      """
+    And I seed the database with Categories:
+      | tag | name |
+      | Business | Business|
+      | Tools & Utilities | Tools & Utilities |
+    And I seed the database with Groups:
+      | tag | name |
+      | appzone | AppZone |
+      | categories | Categories |
+      | form_factors | Form Factors |
+
+  Scenario: Exporting Banyan Category Translations
+    When I run `bundle exec rake translations:categories:export[current_translations.yml]`
+    Then the file "current_translations.yml" should contain "en:"
+    And the file "current_translations.yml" should be valid yaml
+
+  Scenario: Importing Banyan Category Translations
+    Given a file named "new_translations.yml" with:
+      """
+      ---
+      banyan_category_translations:
+        de:
+          Business: Unternehmen_DE
+          "Tools & Utilities": Werkzeuge und Hilfsprogramme_DE
+      banyan_category_group_translations:
+        de:
+          appzone: AppZone_DE
+          categories: Kategorien_DE
+          form_factors: Formfaktoren_DE
+      """
+    When I run `bundle exec rake translations:categories:import[new_translations.yml]`
+    Then the output should contain "Updated 5 translations"
+
+  Scenario: Import and Export
+    Given a file named "new_translations.yml" with:
+    """
+    ---
+    banyan_category_translations:
+      de:
+        Business: Unternehmen
+        "Tools & Utilities": Werkzeuge und Hilfsprogramme
+    banyan_category_group_translations:
+      de:
+        appzone: AppZone
+        categories: Kategorien
+        form_factors: Formfaktoren
+    """
+    And I run `rake translations:categories:import[new_translations.yml]`
+    When I run `rake translations:categories:export[current_translations.yml]`
+    Then the file "current_translations.yml" should contain "form_factors: Formfaktoren"
+
+  Scenario: Export and Import (and Export)
+    Given I run `bundle exec rake translations:categories:export[new_fr_translations.yml]`
+    And I translate "banyan_category_translations.fr.Tools & Utilities" to "Outils & Utilitaires" into "new_fr_translations.yml"
+    And I translate "banyan_category_group_translations.fr.categories" to "Catégories" into "new_fr_translations.yml"
+    When I run `rake translations:categories:import[new_fr_translations.yml]`
+    Then the output should contain "Updated 2 translations"
+    And I run `rake translations:categories:export[current_translations.yml]`
+    Then the file "current_translations.yml" should contain "Tools & Utilities: Outils & Utilitaires"
+    And the file "current_translations.yml" should contain "categories: Catégories"

data/lib/banyan.rb

@@ -8,6 +8,8 @@ module Banyan
   autoload :Categorization, "#{ROOT}/banyan/categorization"
   autoload :Category,       "#{ROOT}/banyan/category"
   autoload :CategoryGroup,  "#{ROOT}/banyan/category_group"
+
+  require "#{ROOT}/banyan/railtie" if defined?(Rails)
 end
 
 ActiveRecord::Base.class_eval { include Banyan::Categorizable }

data/lib/banyan/railtie.rb

@@ -0,0 +1,9 @@
+require 'banyan/tasks'
+require 'rails'
+module Banyan
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      Banyan::Tasks.new
+    end
+  end
+end

data/lib/banyan/tasks.rb

@@ -0,0 +1,101 @@
+require 'rake'
+
+module Banyan
+  class Tasks
+    include ::Rake::DSL
+
+    def initialize
+      define_tasks
+    end
+
+    def define_tasks
+      namespace :translations do
+        namespace :categories do
+          desc "export data into yml file"
+          task :export, [:full_filename] => :environment do |t, args|
+            args.with_defaults(full_filename: "current_translations.yml")
+            filename = args[:full_filename] || 'current_translations.yml'
+
+            hash_categorygroup_translations = {}
+            I18n.available_locales.each do |l|
+              cg_translations = Banyan::CategoryGroup::Translation.select('banyan_category_group_id, name').where(locale: l)
+              hash_categorygroup_translations[l.to_s] = cg_translations.each_with_object({}) do |cgt,h|
+                banyan_category_group = Banyan::CategoryGroup.find cgt.banyan_category_group_id
+                h[banyan_category_group.tag] = cgt.name
+              end
+            end
+
+            hash_category_translations = {}
+            I18n.available_locales.each do |l|
+              cat_translations = Banyan::Category::Translation.select('banyan_category_id, name').where(locale: l)
+              hash_category_translations[l.to_s] = cat_translations.each_with_object({}) do |ct,h|
+                banyan_category = Banyan::Category.find ct.banyan_category_id
+                h[banyan_category.tag] = ct.name
+              end
+            end
+
+            File.open("#{Rails.root}/#{filename}", 'w') do |file|
+              file.puts({'banyan_category_group_translations' => hash_categorygroup_translations,
+                         'banyan_category_translations'       => hash_category_translations     }.to_yaml)
+            end
+          end
+
+          desc "import translations from yml file"
+          task :import, [:full_filename] => :environment do |t, args|
+            args.with_defaults(full_filename: "new_translations.yml")
+            filename = args[:full_filename] || 'new_translations.yml'
+
+            counter = 0
+            yf = File.open("#{Rails.root}/#{filename}", "r")
+            ydata = YAML.load_file(yf)
+
+            ydata.each do |(kind,node)|
+              if kind == 'banyan_category_group_translations'
+                puts I18n.available_locales.inspect
+                I18n.available_locales.each do |l|
+                  if node[l.to_s]
+                    hash = node[l.to_s]
+                    hash.each_pair do |key, value|
+                      banyan_category_groups = Banyan::CategoryGroup.where(tag: key)
+                      banyan_category_groups.each do |banyan_category_group|
+                        banyan_category_group_translation = Array(banyan_category_group.translations.find_or_create_by_locale(l)).first
+                        if banyan_category_group_translation
+                          banyan_category_group_translation.attributes= {name: value}
+                          if banyan_category_group_translation.changed? && banyan_category_group_translation.save!
+                            counter += 1
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              elsif kind == 'banyan_category_translations'
+                I18n.available_locales.each do |l|
+                  if node[l.to_s]
+                    hash = node[l.to_s]
+                    hash.each_pair do |key, value|
+                      banyan_categories = Banyan::Category.where(tag: key)
+                      banyan_categories.each do |banyan_category|
+                        banyan_category_translation = Array(banyan_category.translations.find_or_create_by_locale(l)).first
+                        if banyan_category_translation
+                          banyan_category_translation.attributes = {name: value}
+                          if banyan_category_translation.changed? && banyan_category_translation.save!
+                            counter += 1
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
+            puts "Updated #{counter} translations"
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/banyan/version.rb

@@ -1,3 +1,3 @@
 module Banyan
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banyan
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Bernard Potocki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +96,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: 
 email:
 - bernard.potocki@rebased.pl
@@ -123,11 +137,16 @@ files:
 - README.md
 - Rakefile
 - banyan.gemspec
+- features/step_definitions/translation_import_and_export_steps.rb
+- features/support/env.rb
+- features/translation_import_and_export.feature
 - lib/banyan.rb
 - lib/banyan/categorizable.rb
 - lib/banyan/categorization.rb
 - lib/banyan/category.rb
 - lib/banyan/category_group.rb
+- lib/banyan/railtie.rb
+- lib/banyan/tasks.rb
 - lib/banyan/version.rb
 - lib/generators/banyan/banyan_generator.rb
 - lib/generators/banyan/templates/migration.rb
@@ -170,6 +189,9 @@ signing_key:
 specification_version: 4
 summary: Pluggable categories and category groups to ActiveRecord models
 test_files:
+- features/step_definitions/translation_import_and_export_steps.rb
+- features/support/env.rb
+- features/translation_import_and_export.feature
 - spec/banyan/banyan_category_group_spec.rb
 - spec/banyan/banyan_category_spec.rb
 - spec/banyan/banyan_group_model_spec.rb