interpret 1.0.1 → 1.0.2

data/app/models/interpret/translation.rb

@@ -4,8 +4,10 @@ module Interpret
     default_scope order('locale ASC')
     validates_uniqueness_of :key, :scope => :locale
     validates_presence_of :locale
+    validate :key_format
 
     after_update :set_stale
+    before_validation :downcase_key
 
     scope :stale, where(:stale => true)
 
@@ -20,6 +22,14 @@ module Interpret
       Translation.where(:key => key).where(Translation.arel_table[:locale].not_eq(locale)).update_all({:stale => true})
     end
 
+    def downcase_key
+      self.key = key.downcase
+    end
+
+    def key_format
+      errors.add(:key, "has an invalid format") unless key =~ /^[a-zA-Z0-9\._]+$/
+    end
+
     class << self
 
       def allowed

data/interpret.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "i18n-active_record"
   s.add_dependency "ya2yaml", ">= 0.30.0"
-  s.add_dependency "best_in_place", "~> 1.0.0"
+  s.add_dependency "best_in_place", "~> 1.0"
   s.add_dependency "lazyhash", ">= 0.1.1"
   s.add_dependency "cancan", "~> 1.6.0"
 

data/lib/interpret/version.rb

@@ -1,3 +1,3 @@
 module Interpret
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/models/translation_spec.rb

@@ -302,4 +302,29 @@ es:
       Interpret::Translation.locale("pt").find_by_key("p1").stale?.should be_false
     end
   end
+
+  describe "downcase key" do
+    it "should be performed before validation" do
+      subject.key = "PayPal.resume"
+      subject.save!
+      subject.key.should == "paypal.resume"
+    end
+  end
+
+  describe "key format" do
+    it "should not allow spaces" do
+      subject.key = "not allowed spaces"
+      subject.should_not be_valid
+    end
+
+    it "should not allow -" do
+      subject.key = "not-allowed"
+      subject.should_not be_valid
+    end
+
+    it "should allow _" do
+      subject.key = "some_key.other_key"
+      subject.should be_valid
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interpret
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &71763650 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *71763650
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &71763160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *71763160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
-  requirement: &71762760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71762760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ya2yaml
-  requirement: &71762350 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +69,31 @@ dependencies:
         version: 0.30.0
   type: :runtime
   prerelease: false
-  version_requirements: *71762350
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: best_in_place
-  requirement: &71761950 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *71761950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lazyhash
-  requirement: &71760620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *71760620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &71758700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *71758700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &71866240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *71866240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &71865910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *71865910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &71865660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71865660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage your app translations with an i18n active_record backend
 email:
 - roger@itnig.net
@@ -264,21 +314,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -372104909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -372104909
 requirements: []
 rubyforge_project: interpret
-rubygems_version: 1.8.10
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Manage your app translations with an i18n active_record backend