schema_comments 0.2.0.alpha1 → 0.2.0.alpha2

data/Gemfile

@@ -1,11 +1,10 @@
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.1.0"
-gem "activerecord", "~> 3.1.0"
-
+gem "activesupport", ">= 3.0.0"
+gem "activerecord", ">= 3.0.0"
 
 group :test do
-  gem "rails", "~> 3.1.0"
+  gem "rails", ">= 3.0.0"
   gem "sqlite3"
   gem "yaml_waml"
 end

data/Gemfile.lock

@@ -1,35 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.4)
-      actionpack (= 3.1.4)
-      mail (~> 2.3.0)
-    actionpack (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-      arel (~> 2.2.3)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-    activesupport (3.1.4)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.3)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
@@ -41,34 +40,33 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.3)
     json (1.6.6)
-    mail (2.3.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.2.0)
+    multi_json (1.3.0)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.4)
-      actionmailer (= 3.1.4)
-      actionpack (= 3.1.4)
-      activerecord (= 3.1.4)
-      activeresource (= 3.1.4)
-      activesupport (= 3.1.4)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.4)
-    railties (3.1.4)
-      actionpack (= 3.1.4)
-      activesupport (= 3.1.4)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -93,7 +91,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -111,11 +109,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.1.0)
-  activesupport (~> 3.1.0)
+  activerecord (>= 3.0.0)
+  activesupport (>= 3.0.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.8.3)
-  rails (~> 3.1.0)
+  rails (>= 3.0.0)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   rspec-rails (~> 2.8.1)

data/VERSION

@@ -1 +1 @@
-0.2.0.alpha1
+0.2.0.alpha2

data/lib/schema_comments/base.rb

@@ -6,6 +6,7 @@ module SchemaComments
         alias :columns_without_schema_comments :columns
         alias :columns :columns_with_schema_comments
       end
+      mod.ignore_pattern_to_export_i18n = /\[.*\]/
     end
 
     module ClassMethods
@@ -33,7 +34,7 @@ module SchemaComments
         @table_comment = nil
       end
 
-      attr_accessor_with_default :ignore_pattern_to_export_i18n, /\[.*\]/
+      attr_accessor :ignore_pattern_to_export_i18n
 
       def export_i18n_models
         subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|

data/schema_comments.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "schema_comments"
-  s.version = "0.2.0.alpha1"
+  s.version = "0.2.0.alpha2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]
@@ -82,8 +82,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.0"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.1"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
@@ -92,8 +92,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
@@ -103,8 +103,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
     s.add_dependency(%q<yard>, ["~> 0.7"])

data/tasks/schema_comments.rake

@@ -15,7 +15,7 @@ namespace :db do
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
   end
-  
+
   Rake.application.send(:eval, "@tasks.delete('db:rollback')")
   desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
   task :rollback => :environment do
@@ -58,7 +58,7 @@ namespace :db do
       SchemaComments::SchemaComment.yaml_access do
         SchemaComments.quiet = true
         if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-          Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:load" 
+          Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:load"
           }[ActiveRecord::Base.schema_format]].invoke
         end
       end
@@ -71,8 +71,9 @@ end
 
 class ActiveRecord::Base
   class << self
-    attr_accessor_with_default :ignore_pattern_to_export_i18n, /\(\(\(.*\)\)\)/
-    
+    attr_accessor :ignore_pattern_to_export_i18n
+    self.ignore_pattern_to_export_i18n = /\(\(\(.*\)\)\)/
+
     def export_i18n_models
       subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
         (klass != SchemaComments::SchemaComment) and
@@ -87,18 +88,18 @@ class ActiveRecord::Base
         d[model_name] = comment
         d
       end
-			result.instance_eval do
-				def each_with_order(*args, &block)
-					self.keys.sort.each do |key|
-						yield(key, self[key])
-					end
-				end
-				alias :each_without_order :each
-				alias :each :each_with_order
-			end
-			result			
+      result.instance_eval do
+        def each_with_order(*args, &block)
+          self.keys.sort.each do |key|
+            yield(key, self[key])
+          end
+        end
+        alias :each_without_order :each
+        alias :each :each_with_order
+      end
+      result
     end
-    
+
     def export_i18n_attributes
       subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
         (klass != SchemaComments::SchemaComment) and
@@ -116,7 +117,7 @@ class ActiveRecord::Base
           comment.gsub!(/\[\[\[.*?\]\]\]/)
           attrs[attr_name] = comment
         end
-        
+
         column_names = m.columns.map(&:name) - ['id']
         column_order_modeule = Module.new do
           def each_with_column_order(*args, &block)
@@ -124,7 +125,7 @@ class ActiveRecord::Base
               yield(column_name, self[column_name])
             end
           end
-          
+
           def self.extended(obj)
             obj.instance_eval do
               alias :each_without_column_order :each
@@ -134,13 +135,13 @@ class ActiveRecord::Base
         end
         attrs.instance_variable_set(:@column_names, column_names)
         attrs.extend(column_order_modeule)
-        
+
         # テーブル名(複数形)をモデル名(単数形)に
         model_name = ((m.table_comment || '').scan(/\[\[\[(?:model|class)(?:_name)?:\s*?([^\s]+?)\s*?\]\]\]/).flatten.first || m.name).underscore
         d[model_name] = attrs
         d
       end
-      
+
       result.instance_eval do
         def each_with_order(*args, &block)
           self.keys.sort.each do |key|
@@ -162,28 +163,28 @@ namespace :i18n do
         require file_name
       end
     end
-    
+
     desc "Export i18n model resources from schema_comments. you can set locale with environment variable LOCALE"
     task :export_models => :"i18n:schema_comments:load_all_models" do
       locale = (ENV['LOCALE'] || I18n.locale).to_s
       obj = {locale => {'activerecord' => {'models' => ActiveRecord::Base.export_i18n_models}}}
       puts YAML.dump(obj)
     end
-    
+
     desc "Export i18n attributes resources from schema_comments. you can set locale with environment variable LOCALE"
     task :export_attributes => :"i18n:schema_comments:load_all_models" do
       locale = (ENV['LOCALE'] || I18n.locale).to_s
       obj = {locale => {'activerecord' => {'attributes' => ActiveRecord::Base.export_i18n_attributes}}}
       puts YAML.dump(obj)
     end
-    
+
     desc "update i18n YAML. you can set locale with environment variable LOCALE"
     task :update_config_locale => :"i18n:schema_comments:load_all_models" do
       require 'yaml/store'
       locale = (ENV['LOCALE'] || I18n.locale).to_s
       path = (ENV['YAML_PATH'] || File.join(RAILS_ROOT, "config/locales/#{locale}.yml"))
       print "updating #{path}..."
-      
+
       begin
         db = YAML::Store.new(path)
         db.transaction do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_comments
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha1
+  version: 0.2.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,29 +13,29 @@ date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168469280 !ruby/object:Gem::Requirement
+  requirement: &2158918000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168469280
+  version_requirements: *2158918000
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168468800 !ruby/object:Gem::Requirement
+  requirement: &2158916980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168468800
+  version_requirements: *2158916980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168468320 !ruby/object:Gem::Requirement
+  requirement: &2158916160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2168468320
+  version_requirements: *2158916160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2168484960 !ruby/object:Gem::Requirement
+  requirement: &2158915500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2168484960
+  version_requirements: *2158915500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168484480 !ruby/object:Gem::Requirement
+  requirement: &2158915020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2168484480
+  version_requirements: *2158915020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2168484000 !ruby/object:Gem::Requirement
+  requirement: &2158974440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2168484000
+  version_requirements: *2158974440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168483520 !ruby/object:Gem::Requirement
+  requirement: &2158973900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2168483520
+  version_requirements: *2158973900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2168483040 !ruby/object:Gem::Requirement
+  requirement: &2158973420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2168483040
+  version_requirements: *2158973420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2168482560 !ruby/object:Gem::Requirement
+  requirement: &2158972860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168482560
+  version_requirements: *2158972860
 description: schema_comments generates extra methods dynamically for attribute which
   has options
 email: akm2000@gmail.com
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1307889187071139456
+      hash: -3771409335729466144
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: