parsable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc2aca5f2edb3f0bb1d0522ac63de4a73125969
-  data.tar.gz: 207194e469beaf3c8ebc89e49bdbda02251550c5
+  metadata.gz: 48f0ddf2c95fb1197cd638d4e8bfaed246c89be1
+  data.tar.gz: 874eee2df9c4fe3ea3889d11fdbb2d1e6c0225b8
 SHA512:
-  metadata.gz: 952219dcc4492b0df30c0bb15b1415c3cdf0ebdddd344d46fb963b9c1cba9b612164d51885996a34b1e60dd33c109928e9ae872a4044ca75867488fa401baae3
-  data.tar.gz: c12bdd6d23ee1ba81c7a555ddba9d18e6ce06394a5abe1276e8d25f107e2df6e6a6eb9607a585512a300f7ce995ef940321ab2b393e326fe73a223d1af7c54d1
+  metadata.gz: 0f833679a76bf2828ee3a970be01529ac56a18dbfafc294a7ffbda35faf6956fbc86543dbac7ebb73085595a4459391771321ff405e8979f3ed5a5ba323a74bd
+  data.tar.gz: bac16f61d81fa2a50df895529e17674c7ebad8dd8171bbc6cc771cdf1cbb77b12a6ade4b0ddadc39c698f45758479b9e386ee4e0d69d96a7030a210b216849d2

data/lib/parsable/parsed_item.rb

@@ -0,0 +1,12 @@
+module Parsable
+  class ParsedItem
+    attr_accessor :original, :function, :object, :attribute
+
+    def initialize args={}
+      @original  = args[:original]
+      @function  = args[:function]
+      @object    = args[:object]
+      @attribute = args[:attribute]
+    end
+  end
+end

data/lib/parsable/parser.rb

@@ -1,12 +1,10 @@
 module Parsable
   class Parser
 
-    attr_accessor :object, :attribute, :function_method, 
-                  :original_string, :strings, :context
+    attr_accessor :original_string, :strings
 
     def initialize args={}
       @original_string = args.fetch(:string).to_s
-      @context         = args.fetch(:context, Parsable::Context.new)
       @strings         = all_captures(@original_string)
     end
 
@@ -14,16 +12,12 @@ module Parsable
       strings.uniq.collect do |string|
         function, object, attribute = capture(string)
 
-        { 
-          :original  => string, :function  => function,
-          :object    => object, :attribute => attribute,
-          :lambda    => lambda {
-            # if context[object.to_sym].respond_to?(attribute.to_sym)
-            #   context[object.to_sym].send(attribute.to_sym)
-            # end
-            context.read(object, attribute)
-          }
-        }
+        Parsable::ParsedItem.new(\
+          :original  => string, 
+          :function  => function,
+          :object    => object,
+          :attribute => attribute
+        )
       end
     end
 

data/lib/parsable/version.rb

@@ -1,3 +1,3 @@
 module Parsable
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/parsable.rb

@@ -1,17 +1,19 @@
 require "parsable/version"
 require 'parsable/parser'
 require 'parsable/context'
+require 'parsable/parsed_item'
 
 module Parsable
   
   def self.crunch args={}
     original      = args.fetch(:string).to_s
     parsed_parts  = Parsable::Parser.new(args).parse
+    context       = args[:context] || Parsable::Context.new
 
     crunched = original.dup
 
     parsed_parts.each do |item|
-      crunched.gsub!("{{#{item[:original]}}}", "#{item[:lambda].call}")
+      crunched.gsub!("{{#{item.original}}}", context.read(item.object, item.attribute).to_s)
     end
 
     crunched

data/spec/context_spec.rb

@@ -25,9 +25,17 @@ describe Parsable::Context do
   end
 
   describe '#read' do
-    it "gets value for object.attribute" do
-      context.instance_variable_get('@variables')[:test_object] = OpenStruct.new(:fruit => 'bananas')
-      expect(context.read('test_object', 'fruit')).to eql("bananas")
+    context 'object_key exists' do
+      it "gets value for object.attribute" do
+        context.instance_variable_get('@variables')[:test_object] = OpenStruct.new(:fruit => 'bananas')
+        expect(context.read('test_object', 'fruit')).to eql("bananas")
+      end
+    end
+
+    context 'no object_key' do
+      it "is nil" do
+        expect(context.read('not_exists', 'fruit')).to be_nil
+      end
     end
   end
 

data/spec/parser_spec.rb

@@ -25,11 +25,11 @@ describe Parsable::Parser do
           @parsed = Parsable::Parser.new(:string => %(my+{{location.name}}@email.com)).parse.first
         end
         it "parses object name" do
-          expect(@parsed[:object]).to eql('location')
+          expect(@parsed.object).to eql('location')
         end
 
         it "parses attribute" do
-          expect(@parsed[:attribute]).to eql('name')
+          expect(@parsed.attribute).to eql('name')
         end
       end
 
@@ -37,7 +37,7 @@ describe Parsable::Parser do
         it "parses function method" do
           string = %(my+{{url_safe(location.name)}}@email.com)
           parsed = Parsable::Parser.new(:string => string).parse.first
-          expect(parsed[:function]).to eql('url_safe')
+          expect(parsed.function).to eql('url_safe')
         end
       end
     end
@@ -53,13 +53,13 @@ describe Parsable::Parser do
 
       context 'no function method' do
         it "parses object names" do
-          expect(@parsed.first[:object]).to eql('location')
-          expect(@parsed.last[:object]).to eql('email')
+          expect(@parsed.first.object).to eql('location')
+          expect(@parsed.last.object).to eql('email')
         end
 
         it "parses attributes" do
-          expect(@parsed.first[:attribute]).to eql('name')
-          expect(@parsed.last[:attribute]).to eql('domain')
+          expect(@parsed.first.attribute).to eql('name')
+          expect(@parsed.last.attribute).to eql('domain')
         end
       end
 
@@ -68,8 +68,8 @@ describe Parsable::Parser do
           string = %(my+{{url_safe(location.name)}}@{{email.domain}}.com)
           parsed = Parsable::Parser.new(:string => string).parse
 
-          expect(parsed.first[:function]).to eql('url_safe')
-          expect(parsed.last[:function]).to be_nil
+          expect(parsed.first.function).to eql('url_safe')
+          expect(parsed.last.function).to be_nil
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parsable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hubert Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - lib/parsable.rb
 - lib/parsable/context.rb
+- lib/parsable/parsed_item.rb
 - lib/parsable/parser.rb
 - lib/parsable/version.rb
 - parsable.gemspec