lit 0.0.3.1 → 0.0.4

data/app/controllers/lit/localizations_controller.rb

@@ -9,7 +9,7 @@ module Lit
     end
 
     def update
-      if @localization.update_attributes(params[:localization])
+      if @localization.update_attributes(clear_params)
         Lit.init.cache.refresh_key @localization.full_key
       end
       respond_to :js
@@ -23,5 +23,13 @@ module Lit
       def find_localization
         @localization = @localization_key.localizations.find(params[:id])
       end
+
+      def clear_params
+        if ::Rails::VERSION::MAJOR>=4
+          params[:localization].permit(:translated_value, :locale_id)
+        else
+          params[:localization]
+        end
+      end
   end
 end

data/app/models/lit/locale.rb

@@ -2,7 +2,7 @@ module Lit
   class Locale < ActiveRecord::Base
 
     ## SCOPES
-    scope :ordered, order('locale ASC')
+    scope :ordered, proc{ order('locale ASC') }
 
     ## ASSOCIATIONS
     has_many :localizations, :dependent=>:destroy
@@ -12,8 +12,10 @@ module Lit
               :presence=>true,
               :uniqueness=>true
 
-    ## ACCESSIBLE
-    attr_accessible :locale
+    if ::Rails::VERSION::MAJOR<4
+      ## ACCESSIBLE
+      attr_accessible :locale
+    end
 
     def to_s
       self.locale

data/app/models/lit/localization.rb

@@ -2,7 +2,7 @@ module Lit
   class Localization < ActiveRecord::Base
 
     ## SCOPES
-    scope :changed, where(:is_changed=>true)
+    scope :changed, proc{ where(:is_changed=>true) }
 
     ## ASSOCIATIONS
     belongs_to :locale
@@ -12,8 +12,10 @@ module Lit
     validates :locale_id,
               :presence=>true
 
-    ## ACCESSIBLE
-    attr_accessible :translated_value, :locale_id
+    if ::Rails::VERSION::MAJOR<4
+      ## ACCESSIBLE
+      attr_accessible :translated_value, :locale_id
+    end
 
     ## BEFORE & AFTER
     before_update :update_is_changed

data/app/models/lit/localization_key.rb

@@ -2,10 +2,10 @@ module Lit
   class LocalizationKey < ActiveRecord::Base
 
     ## SCOPES
-    scope :completed, where(:is_completed=>true)
-    scope :not_completed, where(:is_completed=>false)
-    scope :starred, where(:is_starred=>true)
-    scope :ordered, order('localization_key asc')
+    scope :completed, proc{ where(:is_completed=>true) }
+    scope :not_completed, proc{ where(:is_completed=>false) }
+    scope :starred, proc{ where(:is_starred=>true) }
+    scope :ordered, proc{ order('localization_key asc') }
 
     ## ASSOCIATIONS
     has_many :localizations, :dependent=>:destroy
@@ -15,8 +15,10 @@ module Lit
               :presence=>true,
               :uniqueness=>true
 
-    ## ACCESSIBLE
-    attr_accessible :localization_key
+    if ::Rails::VERSION::MAJOR<4
+      ## ACCESSIBLE
+      attr_accessible :localization_key
+    end
 
     def to_s
       self.localization_key

data/config/routes.rb

@@ -1,6 +1,6 @@
 Lit::Engine.routes.draw do
 
-  resources :localization_keys, :actions=>[:index, :destroy] do
+  resources :localization_keys, :only=>[:index, :destroy] do
     member do
       get :star
     end

data/lib/lit.rb

@@ -4,6 +4,7 @@ require 'lit/loader'
 module Lit
   mattr_accessor :authentication_function
   mattr_accessor :key_value_engine
+  mattr_accessor :storage_options
   class << self
     attr_accessor :loader
   end
@@ -13,6 +14,7 @@ module Lit
       #if loading all translations on start, migrations have to be performed
       #already, fails on first deploy
       #self.loader.cache.load_all_translations
+      Lit.storage_options ||= {}
     end
     self.loader
   end

data/lib/lit/adapters/redis_storage.rb

@@ -12,24 +12,33 @@ module Lit
     end
 
     def [](key)
-      Lit.redis.get(key)
+      Lit.redis.get(_prefixed_key(key))
     end
 
     def []=(k, v)
-      Lit.redis.set(k.to_s, v.to_s)
+      Lit.redis.set(_prefixed_key(k).to_s, v.to_s)
     end
 
     def clear
-      Lit.redis.flushall
+      Lit.redis.del self.keys
       save
     end
 
     def keys
-      Lit.redis.keys
+      Lit.redis.keys(_prefixed_key+"*")
     end
 
     def has_key?(key)
-      Lit.redis.exists(key)
+      Lit.redis.exists(_prefixed_key(key))
     end
+
+    private
+      def _prefixed_key(key="")
+        prefix = "lit:"
+        if Lit.storage_options.is_a?(Hash)
+          prefix += "#{Lit.storage_options[:prefix]}:" if Lit.storage_options.has_key?(:prefix)
+        end
+        prefix+key
+      end
   end
 end

data/lib/lit/cache.rb

@@ -43,8 +43,6 @@ module Lit
       locale_key, key_without_locale = split_key(key)
       locale = find_locale(locale_key)
       localization = find_localization(locale, key_without_locale)
-      puts @localizations.class
-      Lit.init.logger.info @localizations.class
       @localizations[key] = localization.get_value
     end
 
@@ -121,7 +119,7 @@ module Lit
             end
           end
           l.default_value = value
-          Lit.init.logger.info "creating new localization: #{key_without_locale}"
+          #Lit.init.logger.info "creating new localization: #{key_without_locale}"
           #Lit.init.logger.info "creating new localization with value: #{value}"
           #Lit.init.logger.info "creating new localization with value: #{value.class}"
           create = true

data/lib/lit/i18n_backend.rb

@@ -28,7 +28,7 @@ module Lit
     # @param [Hash] options unused part of the I18n API
     def store_translations(locale, data, options = {})
       super
-      Lit.init.logger.info "store translation: #{locale}, data: #{data}, options: #{options}"
+      #Lit.init.logger.info "store translation: #{locale}, data: #{data}, options: #{options}"
       store_item(locale, data)
     end
 
@@ -36,7 +36,7 @@ module Lit
     private
 
     def lookup(locale, key, scope = [], options = {})
-      Lit.init.logger.info "lookup translation: #{key}, scope: #{scope}, options: #{options}"
+      #Lit.init.logger.info "lookup translation: #{key}, scope: #{scope}, options: #{options}"
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
       content = @cache[key_with_locale] || super

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.0.3.1"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency