weeler 1.4.0 → 1.5.1

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ RSpec.configure do |config|
 
   # FactoryGirl
   config.include FactoryGirl::Syntax::Methods
-
+  
   Capybara.javascript_driver = :webkit
 
   # disable empty translation creation

data/spec/weeler/action_controller/acts/restful_spec.rb

@@ -127,7 +127,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
           end
 
           it "warns developer" do
-            warning_message = "[UNPERMITED PARAMS] To permiting {\"title\"=>\"Foo lala\", \"body\"=>\"Heila\"} params, add 'permit_params: [:title, :body]' option to 'acts_as_restful'\n"
+            warning_message = "[UNPERMITED PARAMS] To permit {\"title\"=>\"Foo lala\", \"body\"=>\"Heila\"} params, add 'permit_params: [:title, :body]' option to 'acts_as_restful'\n"
             expect { post("create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")) }.to output(warning_message).to_stderr
           end
         end

data/spec/weeler/i18n/backend/weeler/lock_spec.rb

@@ -0,0 +1,89 @@
+require "spec_helper"
+
+describe I18n::Backend::Weeler::Lock do
+
+  before :each do
+    I18n::Backend::Weeler::Lock.destroy_all
+    @reader, @writer = IO.pipe
+  end
+
+  def fork_with_new_connection
+    config = ActiveRecord::Base.remove_connection
+    fork do
+      begin
+        ActiveRecord::Base.establish_connection(config)
+        yield
+      ensure
+        ActiveRecord::Base.remove_connection
+        Process.exit!
+      end
+    end
+    ActiveRecord::Base.establish_connection(config)
+  end
+
+  it 'should synchronize processes on the same lock' do
+    (1..20).each do |i|
+      fork_with_new_connection do
+        @reader.close
+        ActiveRecord::Base.connection.reconnect!
+        I18n::Backend::Weeler::Lock.acquire('lock') do
+          @writer.puts "Started: #{i}"
+          sleep 0.01
+          @writer.puts "Finished: #{i}"
+        end
+        @writer.close
+      end
+    end
+    @writer.close
+
+    # test whether we always get alternating "Started" / "Finished" lines
+    lines = []
+    @reader.each_line { |line| lines << line }
+
+    expect(lines.present?).to eq(true) # it is empty if the processes all crashed due to a typo or similar
+    lines.each_slice(2) do |start, finish|
+      expect(start).to match(/Started: (.*)/)
+      expect(finish).to match(/Finished: (.*)/)
+      expect(/Started: (.*)/.match(start)[1]).to eq(/Finished: (.*)/.match(finish)[1])
+    end
+
+    @reader.close
+  end
+
+  # Fixing / faking coverage
+  # Simplecov doesn't play well with fork.
+  # Tried adding
+  #   pid = Process.pid
+  #   SimpleCov.at_exit do
+  #     SimpleCov.result.format! if Process.pid == pid
+  #   end
+  # but that didn't help.
+  it 'fake' do
+    (1..20).each do |i|
+      # fork do
+        # @reader.close
+        # ActiveRecord::Base.connection.reconnect!
+        I18n::Backend::Weeler::Lock.acquire('lock') do
+          @writer.puts "Started: #{i}"
+          sleep 0.01
+          @writer.puts "Finished: #{i}"
+        end
+        # @writer.close
+      # end
+    end
+    @writer.close
+
+    # test whether we always get alternating "Started" / "Finished" lines
+    lines = []
+    @reader.each_line { |line| lines << line }
+
+    expect(lines.present?).to eq(true) # it is empty if the processes all crashed due to a typo or similar
+    lines.each_slice(2) do |start, finish|
+      expect(start).to match(/Started: (.*)/)
+      expect(finish).to match(/Finished: (.*)/)
+      expect(/Started: (.*)/.match(start)[1]).to eq(/Finished: (.*)/.match(finish)[1])
+    end
+
+    @reader.close
+  end
+end

data/spec/weeler/i18n/backend/weeler/usage_logger_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe I18n::Backend::Weeler::UsageLogger do
+  before(:each) do
+    Settings.log_key_usage = 'true'
+    @backend_cache = I18n.backend.backends[0].i18n_cache
+  end
+
+  describe "1. #log_key_usage" do
+
+    it "logs key to cache store" do
+      I18n.t('random.key.count')
+      expect(@backend_cache.read([:usage_stats, [I18n.locale, 'random.key.count']])).to eq(1)
+      I18n.t('random.key.count')
+      expect(@backend_cache.read([:usage_stats, [I18n.locale, 'random.key.count']])).to eq(2)
+      I18n.t('random.key.count')
+      expect(@backend_cache.read([:usage_stats, [I18n.locale, 'random.key.count']])).to eq(3)
+    end
+
+  end
+
+  describe "2. #dump_key_usage" do
+
+    it "dumps stats to database" do
+      I18n.t('random.key_dump')
+      I18n.t('random.key_dump')
+      I18n.t('random.key_dump')
+      Settings.log_key_usage = 'dump'
+      I18n.t('random.key_dump')
+      expect(I18n::Backend::Weeler::TranslationStat.find_by(key: 'random.key_dump').try(:usage_count)).to eq(3)
+    end
+  end
+
+end

data/spec/weeler/i18n/backend/weeler_spec.rb

@@ -287,6 +287,28 @@ describe I18n::Backend::Weeler do
 
     end
 
+    context "usage logging" do
+
+      it "translation stores all translation in each locale" do
+        Settings.log_key_usage = 'true'
+        expect(I18n.backend.backends[0]).to receive(:log_key_usage)
+        I18n.t("random.key")
+      end
+
+      it "doesn't log keys" do
+        Settings.log_key_usage = 'false'
+        expect(I18n.backend.backends[0]).not_to receive(:log_key_usage)
+        I18n.t("random.key")
+      end
+
+      it "dumps logged keys to database" do
+        Settings.log_key_usage = 'dump'
+        expect(I18n.backend.backends[0]).to receive(:dump_key_usage)
+        I18n.t("random.key")
+      end
+      
+    end
+
   end
 
 end

data/weeler.gemspec

@@ -40,9 +40,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'factory_girl_rails'
   if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    spec.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
   else
-    spec.add_development_dependency 'sqlite3'
+    spec.add_development_dependency 'pg'
   end
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'shoulda-matchers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weeler
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Artūrs Braučs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,7 +264,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -421,8 +421,10 @@ files:
 - lib/generators/weeler/templates/assets/stylesheets/weeler/app/index.css
 - lib/generators/weeler/templates/controllers/weeler/application_controller.rb
 - lib/generators/weeler/templates/initializers/weeler.rb
+- lib/generators/weeler/templates/migrations/create_weeler_locks.rb
 - lib/generators/weeler/templates/migrations/create_weeler_seos.rb
 - lib/generators/weeler/templates/migrations/create_weeler_settings.rb
+- lib/generators/weeler/templates/migrations/create_weeler_translation_stats.rb
 - lib/generators/weeler/templates/migrations/create_weeler_translations.rb
 - lib/generators/weeler/templates/migrations/translate_weeler_seos.rb
 - lib/generators/weeler/templates/views/weeler/.keep
@@ -433,7 +435,9 @@ files:
 - lib/i18n/backend/weeler/exporter.rb
 - lib/i18n/backend/weeler/html_checker.rb
 - lib/i18n/backend/weeler/importer.rb
+- lib/i18n/backend/weeler/lock.rb
 - lib/i18n/backend/weeler/translation.rb
+- lib/i18n/backend/weeler/translation_stat.rb
 - lib/i18n/backend/weeler/usage_logger.rb
 - lib/i18n/humanize_missing_translations.rb
 - lib/i18n/weeler.rb
@@ -449,6 +453,7 @@ files:
 - lib/weeler/engine.rb
 - lib/weeler/version.rb
 - spec/.DS_Store
+- spec/.gitignore
 - spec/controllers/translations_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -486,15 +491,15 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140123083704_create_weeler_seos.rb
 - spec/dummy/db/migrate/20140123083705_create_weeler_settings.rb
 - spec/dummy/db/migrate/20140123083706_create_weeler_translations.rb
 - spec/dummy/db/migrate/20140123083707_translate_weeler_seos.rb
 - spec/dummy/db/migrate/20140718103237_create_posts.rb
 - spec/dummy/db/migrate/20140726151210_create_translations.rb
+- spec/dummy/db/migrate/20160330161101_create_weeler_locks.rb
+- spec/dummy/db/migrate/20160330192005_create_weeler_translation_stats.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/log/development.log
@@ -519,6 +524,8 @@ files:
 - spec/weeler/i18n/backend/weeler/dedupe_spec.rb
 - spec/weeler/i18n/backend/weeler/exporter_spec.rb
 - spec/weeler/i18n/backend/weeler/importer_spec.rb
+- spec/weeler/i18n/backend/weeler/lock_spec.rb
+- spec/weeler/i18n/backend/weeler/usage_logger_spec.rb
 - spec/weeler/i18n/backend/weeler_spec.rb
 - spec/weeler/i18n/humanize_missing_translations_spec.rb
 - weeler.gemspec
@@ -542,12 +549,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: CMS for weby.lv projects.
 test_files:
 - spec/.DS_Store
+- spec/.gitignore
 - spec/controllers/translations_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -585,15 +593,15 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140123083704_create_weeler_seos.rb
 - spec/dummy/db/migrate/20140123083705_create_weeler_settings.rb
 - spec/dummy/db/migrate/20140123083706_create_weeler_translations.rb
 - spec/dummy/db/migrate/20140123083707_translate_weeler_seos.rb
 - spec/dummy/db/migrate/20140718103237_create_posts.rb
 - spec/dummy/db/migrate/20140726151210_create_translations.rb
+- spec/dummy/db/migrate/20160330161101_create_weeler_locks.rb
+- spec/dummy/db/migrate/20160330192005_create_weeler_translation_stats.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/log/development.log
@@ -618,5 +626,7 @@ test_files:
 - spec/weeler/i18n/backend/weeler/dedupe_spec.rb
 - spec/weeler/i18n/backend/weeler/exporter_spec.rb
 - spec/weeler/i18n/backend/weeler/importer_spec.rb
+- spec/weeler/i18n/backend/weeler/lock_spec.rb
+- spec/weeler/i18n/backend/weeler/usage_logger_spec.rb
 - spec/weeler/i18n/backend/weeler_spec.rb
 - spec/weeler/i18n/humanize_missing_translations_spec.rb