active_text 0.0.4 → 0.0.5

data/README.textile

@@ -25,19 +25,21 @@ You can pass that into a ActiveText:
 
 <pre>
 @at = ActiveText::Base.new(text_you_see_above)
-@at.bg_image.name # returns "Background image"
-@at.bg_image.kind # returns "file"
-@at.bg_image.value # returns %Q("http://someurl.com/bg.jpg") - note that there are double quotes in the string
-@at.link_color.kind # returns "color"
-@at.link_color.value # returns "#555"
+@at[:bg_image][:name] # "Background image"
+@at[:bg_image][:kind] # "file"
+@at[:bg_image][:value] # %Q("http://someurl.com/bg.jpg") - note that there are double quotes in the string
+@at.bg_image # same as @at[:bg_image][:value]
+@at[:link_color][:kind] # "color"
+@at[:link_color][:value] # "#555"
+@at.link_color # same as @at[:link_color][:value]
 </pre>
 
 You can also update the values:
 
 <pre>
 @at = ActiveText::Base.new(text_you_see_above)
-@at.bg_image.value = "'/path/to/image.png'"
-@at.apply # returns the text passed into base, with values replaced:
+@at.bg_image = "'/path/to/image.png'"
+@at.render # returns the text passed into base, with values replaced:
 </pre>
 
 <pre>

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/active_text.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_text}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-03-18}
+  s.date = %q{2011-04-15}
   s.description = %q{Aims to be able to read and replace "variables" in text in an active record manner. I don't claim that it behaves exactly like ActiveRecord - that is a much more complex beast than this will ever be.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [

data/lib/active_text/base.rb

@@ -13,51 +13,57 @@ module ActiveText
       options[:context] ||= "(^(?:#{options[:comment]}\s@.*#{options[:eol]}){#{options[:context_lines]}})"
       @options = options
 
-      scan
+      # instantiate all variables
+      @text.scan(/^\${1}(.+): .+;/).flatten.each do |variable_name|
+        if has_context?(variable_name)
+          variable = ActiveText::Variable.new(variable_name, context_of(variable_name), @options[:comment])
+          @variables.merge!({variable_name.to_sym => variable})
+        end
+      end
     end
 
     def update_attributes(args)
       args.each do |k, v|
-        send(k) # Instantiate it, so it will exist in @variables
-        @variables[k].value = v unless @variables[k].nil? || v.nil?
+        send "#{k.to_s}=", v
       end
     end
 
     # Used to update the text
-    def apply
+    def render
       @variables.each do |key, var|
         @text.gsub!(/^\$#{key}: .+;/, %Q($#{key}: #{var.value};))
       end
       @text
     end
 
-    def attributes
-      @variables
+    def [](key)
+      variable = @variables[key]
+      {:name => variable.name, :description => variable.description, :value => variable.value, :kind => variable.kind}
     end
 
-    protected
-
-    # scans though the text and instantiates all the variables in @variables
-    def scan
-      @text.each do |string|
-        string =~ /^\${1}([a-zA-Z0-9_]+):.+;/
-        @variables[$1] = ActiveText::Variable.new($1, context_of($1), @options[:comment]) if $1
+    def attributes
+      h = {}
+      @variables.each do |key, variable|
+        h.merge!({key => variable.value})
       end
+      h
     end
 
-    # Whenever a variable is requested for, it falls into this.
-    def method_missing(method_name)
-      if method_name.to_s =~ /[\w]+/
-        context = context_of(method_name)
+    protected
 
-        # If there's no context (no variable with the proper
-        # commented metadata), then it should not be accessible
-        # and it won't be accessible
-        if context.nil? || context == ""
-          nil
+    # Whenever a variable is requested for, it falls into this.
+    def method_missing(method_name, *args, &block)
+      attr_key = method_name.to_s.sub(/\=$/, '').to_sym
+      variable = @variables[attr_key]
+      if variable
+        if method_name.to_s =~ /\=$/
+          value = args[0]
+          variable.value = value unless value.nil?
         else
-          @variables[method_name] ||= ActiveText::Variable.new(method_name, context, @options[:comment])
+          variable.value
         end
+      else
+        raise NoMethodError, "Variable does not exist"
       end
     end
 
@@ -70,5 +76,10 @@ module ActiveText
       before, match = $1, $2
       "#{before}#{match}"
     end
+
+    def has_context?(s)
+      context = context_of(s)
+      !(context.nil? || context == "")
+    end
   end
 end

data/spec/active_text_spec.rb

@@ -17,15 +17,15 @@ $mbc: #555;}
     it "should be able to set variables and return them properly" do
       @atb = ActiveText::Base.new(@text)
 
-      @atb.mbc.name.should == "Masthead BG Color"
-      @atb.mbc.kind.should == "color"
-      @atb.mbc.description.should == "Background color."
-      @atb.mbc.value.should == "#555"
-
-      @atb.mbc2.name.should == "Masthead Background Image"
-      @atb.mbc2.kind.should == "file"
-      @atb.mbc2.description.should == "Background image."
-      @atb.mbc2.value.should == %Q("http://someurl.com/image.jpg")
+      @atb[:mbc][:name].should == "Masthead BG Color"
+      @atb[:mbc][:kind].should == "color"
+      @atb[:mbc][:description].should == "Background color."
+      @atb[:mbc][:value].should == "#555"
+
+      @atb[:mbc2][:name].should == "Masthead Background Image"
+      @atb[:mbc2][:kind].should == "file"
+      @atb[:mbc2][:description].should == "Background image."
+      @atb[:mbc2][:value].should == %Q("http://someurl.com/image.jpg")
     end
   end
 
@@ -36,16 +36,16 @@ $mbc: #555;}
 // @description Background image.
 $mbc2: "http://someurl.com/image.jpg";}
       @s = ActiveText::Base.new(text)
-      @s.mbc2.value = %Q("Another URL")
-      @s.mbc2.value.should == %Q("Another URL")
+      @s.mbc2 = %Q("Another URL")
+      @s.mbc2.should == %Q("Another URL")
 
-      rendered_text = @s.apply
+      rendered_text = @s.render
       rendered_text.should_not match(/http:\/\/someurl\.com\/image\.jpg/)
       rendered_text.should match(/\$mbc2: "Another URL";/)
 
-      @s.mbc2.value = %Q("Some third URL")
-      @s.mbc2.value.should == %Q("Some third URL")
-      rendered_text = @s.apply
+      @s.mbc2 = %Q("Some third URL")
+      @s.mbc2.should == %Q("Some third URL")
+      rendered_text = @s.render
       rendered_text.should_not match(/\$mbc2: "Another URL";/)
       rendered_text.should match(/\$mbc2: "Some third URL";/)
     end
@@ -60,20 +60,43 @@ $mbc2: "http://someurl.com/image.jpg";}
 // @description Background image.
 $mbc2: "Another URL";}
       @s = ActiveText::Base.new(text_old)
-      @s.mbc2.value = %Q("Another URL")
-      @s.apply.should == text_new
+      @s.mbc2 = %Q("Another URL")
+      @s.render.should == text_new
     end
   end
 
   describe "when there's no metadata" do
+    before do
+      @text = %{// @name Masthead Background Image
+// @kind file
+// @description Background image.
+$mbc2: "http://someurl.com/image.jpg";
+$mbc: #555;}
+      @s = ActiveText::Base.new(@text)
+    end
+
     it "should not allow reading of data" do
-      text = %{// @name Masthead Background Image
+      lambda {@s.mbc}.should raise_error(NoMethodError)
+    end
+  end
+
+  describe ".attributes" do
+    it ".attributes should return an empty hash when there are no valid variables" do
+      @text = %{
+$mbc2: "http://someurl.com/image.jpg";
+$mbc: #555;}
+      @s = ActiveText::Base.new(@text)
+      @s.attributes.should == {}
+    end
+
+    it "should only return the valid variables" do
+      @text = %{// @name Masthead Background Image
 // @kind file
 // @description Background image.
 $mbc2: "http://someurl.com/image.jpg";
 $mbc: #555;}
-      @s = ActiveText::Base.new(text)
-      @s.mbc.should be_nil
+      @s = ActiveText::Base.new(@text)
+      @s.attributes.should == {:mbc2 => %Q("http://someurl.com/image.jpg")}
     end
   end
 
@@ -89,21 +112,29 @@ $mbc2: "http://someurl.com/image.jpg";
 $mbc: #555;}
     @s = ActiveText::Base.new(text)
     @s.update_attributes(:mbc2 => %Q("Another URL"), :mbc => nil)
-    @s.mbc2.value.should == %Q("Another URL")
-    @s.mbc.value.should == "#555"
+    @s.mbc2.should == %Q("Another URL")
+    @s.mbc.should == "#555"
   end
 
-  it "should keep a record of what attributes are in it" do
-    @text = %{// @name Masthead Background Image
+  it "should have setter method for variables" do
+    text = %{// @name Masthead Background Image
 // @kind file
 // @description Background image.
 $mbc2: "http://someurl.com/image.jpg";
+}
+    @s = ActiveText::Base.new(text)
+    @s.mbc2 = "44"
+    @s.mbc2.should == "44"
+  end
 
-// @name Masthead BG Color
-// @kind color
-// @description Background color.
-$mbc: #555;}
-    @at = ActiveText::Base.new(@text)
-    @at.attributes.size.should == 2
+  it "should not allow to set to nil" do
+    text = %{// @name Masthead Background Image
+// @kind file
+// @description Background image.
+$mbc2: "http://someurl.com/image.jpg";
+}
+    @s = ActiveText::Base.new(text)
+    @s.mbc2 = nil
+    @s.mbc2.should == %Q("http://someurl.com/image.jpg")
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_text
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +08:00
+date: 2011-04-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency