tagen 1.1.0 → 1.1.1

data/Gemfile

@@ -1,8 +1,10 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
+
+gem 'activesupport', '~>3.1.0'
 
 group :development do
-	gem "rspec"
-  gem "watchr"
+	gem 'rspec'
+  gem 'watchr'
 end
 
 #gemspec

data/Gemfile.lock

@@ -1,28 +1,24 @@
-PATH
-  remote: .
-  specs:
-    tagen (0.2.4)
-      activesupport
-      pd
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
-    diff-lcs (1.1.2)
-    pd (1.0.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    multi_json (1.0.3)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.7.0)
+    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 3.1.0)
   rspec
-  tagen!
+  watchr

data/lib/tagen/core/array.rb

@@ -98,12 +98,13 @@ class Array
 
   alias original_grep grep
 
+  # confict with awesome_print which extend grep, too
   # add grep(arr rb/tage)
-  def grep(pat_s, &blk)
-    pats = Array===pat_s ? pat_s : [pat_s]
-    pats.each.with_object([]) { |k, memo|
-      memo.push *self.original_grep(k)
-    }
-  end
+  #def grep(pat_s, &blk)
+    #pats = Array===pat_s ? pat_s : [pat_s]
+    #pats.each.with_object([]) { |k, memo|
+      #memo.push *self.original_grep(k)
+    #}
+  #end
 
 end # class Array

data/lib/tagen/core/hash.rb

@@ -14,7 +14,8 @@ class Hash
 		keys.length==1 ? values[0] : values
 	end
 
-
+  # confict with awesome_print which extend Array#grep
+  #
   # grep pat at hash's keys, and return a new hash.
   # @see Array#grep
   #
@@ -24,15 +25,15 @@ class Hash
   #  foo.grep(:a) #=> {a: 1}
   #
   # @return [Hash]
-  def grep(pat_s)
-    pats = Array===pat_s ? pat_s : [pat_s]
-
-    filtered_keys = pats.each.with_object([]) { |pat, memo|
-      memo.push *self.keys.grep(pat)
-    }
-    filtered_keys.each.with_object({}) { |k,memo|
-      memo[k] = self[k]
-    }
-end
+  #def grep(pat_s)
+  #  pats = Array===pat_s ? pat_s : [pat_s]
+#
+#    filtered_keys = pats.each.with_object([]) { |pat, memo|
+#      memo.push *self.keys.grep(pat)
+#    }
+#    filtered_keys.each.with_object({}) { |k,memo|
+#      memo[k] = self[k]
+#    }
+#  end
 
 end # class Hash

data/lib/tagen/erb.rb

@@ -10,7 +10,7 @@ class ERB
 	#  erb.result(nil, a: 1) #=> "1"
 	#
 	# @param [Hash,OpenOption] locals
-	def result bind=nil, locals={}
+	def result(bind=nil, locals={})
 		bind ||= TOPLEVEL_BINDING
 		if locals.empty?
 			original_result bind
@@ -20,9 +20,7 @@ class ERB
 	end
 
 	private
-	def result_with_locals bind, locals
-		locals = locals.class.to_s=="OpenOption" ? locals._data : locals
-
+	def result_with_locals(bind, locals)
 		@locals = locals
 		evalstr = <<-EOF
 def run_erb

data/lib/tagen/version.rb

@@ -1,3 +1,3 @@
 module Tagen 
-  VERSION="1.1.0"
+  VERSION="1.1.1"
 end

data/spec/tagen/core/array_spec.rb

@@ -33,11 +33,10 @@ describe Array do
 		end
 	end
 
-  describe "#grep" do
-    it "supports array as an argument" do
-      a = [:a, :b, :c]
-      a.grep([:a, :b]).should == [:a, :b]
-    end
-  end
-
+  #describe "#grep" do
+    #it "supports array as an argument" do
+      #a = [:a, :b, :c]
+      #a.grep([:a, :b]).should == [:a, :b]
+    #end
+  #end
 end

data/spec/tagen/core/hash_spec.rb

@@ -1,10 +1,10 @@
 require "spec_helper"
 
 describe Hash do
-  describe "#grep" do
-    it "works" do
-      a = {a: 1, b: 2, c: 3}
-      a.grep([:a, :b]).should == {a: 1, b: 2}
-    end
-  end
+  #describe "#grep" do
+  #  it "works" do
+  #    a = {a: 1, b: 2, c: 3}
+  #    a.grep([:a, :b]).should == {a: 1, b: 2}
+  #  end
+  #end
 end

data/spec/tagen/erb_spec.rb

@@ -21,10 +21,10 @@ describe ERB do
 			@erb.result(nil, "a" => 2).should == "2"
 		end
 
-		it "support OpenOption" do
-			o = OpenOption.new(a: 1)
-			@erb.result(nil, o).should == '1'
-		end
+		#it "support OpenOption" do
+			#o = OpenOption.new(a: 1)
+			#@erb.result(nil, o).should == '1'
+		#end
 
 	end
 end

data/tagen.gemspec

@@ -1,18 +1,20 @@
-$: << File.expand_path("../lib", __FILE__)
-require "tagen/version"
+$: << File.expand_path('../lib', __FILE__)
+require 'tagen/version'
 
 Gem::Specification.new do |s|
-	s.name = "tagen"
+	s.name = 'tagen'
 	s.version = Tagen::VERSION
-	s.summary = "a core and extra extension to ruby library"
+	s.summary = 'a core and extra extension to ruby library'
 	s.description = <<-EOF
 a core and extra extension to ruby library. 
 	EOF
 
-	s.author = "Guten"
-	s.email = "ywzhaifei@gmail.com"
-	s.homepage = "http://github.com/GutenYe/tagen"
-	s.rubyforge_project = "xx"
+	s.author = 'Guten'
+	s.email = 'ywzhaifei@gmail.com'
+	s.homepage = 'http://github.com/GutenYe/tagen'
+	s.rubyforge_project = 'xx'
 
 	s.files = `git ls-files`.split("\n")
+
+  s.add_dependency 'activesupport', '~>3.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000 Z
-dependencies: []
+date: 2011-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &23214320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *23214320
 description: ! "a core and extra extension to ruby library. \n"
 email: ywzhaifei@gmail.com
 executables: []
@@ -100,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xx
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: a core and extra extension to ruby library