lolita-translation 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "rails", ">=3.0.0"
+gem "lolita", "~> 3.1.15"
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.1.0
-=======
-0.0.4
->>>>>>> 38796e7ad979f60efef15f97f75b327353a5833b
+0.1.1

data/lolita-translation.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-translation}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ITHouse}, %q{Gatis Tomsons}, %q{Arturs Meisters}]
@@ -59,12 +59,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<lolita>, ["~> 3.1.15"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<lolita>, ["~> 3.1.15"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<lolita>, ["~> 3.1.15"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-translation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81809440 !ruby/object:Gem::Requirement
+  requirement: &79530320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *81809440
+  version_requirements: *79530320
+- !ruby/object:Gem::Dependency
+  name: lolita
+  requirement: &79529840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: *79529840
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &81807310 !ruby/object:Gem::Requirement
+  requirement: &79529350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81807310
+  version_requirements: *79529350
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81785300 !ruby/object:Gem::Requirement
+  requirement: &79528890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81785300
+  version_requirements: *79528890
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81784700 !ruby/object:Gem::Requirement
+  requirement: &79528360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +67,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *81784700
+  version_requirements: *79528360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &81784050 !ruby/object:Gem::Requirement
+  requirement: &79526680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +78,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81784050
+  version_requirements: *79526680
 description: Translates models in Lolita
 email: support@ithouse.lv
 executables: []
@@ -117,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 497866193
+      hash: 1000734801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: