benschwarz-smoke 0.5.8 → 0.5.10

data/README.markdown

@@ -70,10 +70,6 @@ Source definition:
 Execution: 
 
     Smoke[:delicious].username("bschwarz").output
-    
-### CI
-
-Integrity [is running for smoke](http://integrity.ffolio.net/smoke)
 
 
 ### TODO (working on, just mental notes)

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "smoke"
-    gem.summary = %Q{smoke is a DSL that allows you to take data from YQL, RSS / Atom}
+    gem.summary = %Q{smoke is a Ruby based DSL that allows you to query web services such as YQL, RSS / Atom and JSON or XML in an elegant manner.}
     gem.email = "ben.schwarz@gmail.com"
     gem.homepage = "http://github.com/benschwarz/smoke"
     gem.authors = ["Ben Schwarz"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
+:patch: 10
 :major: 0
 :minor: 5

data/lib/smoke.rb

@@ -1,11 +1,12 @@
-__DIR__ = File.dirname(__FILE__)
-require File.expand_path(File.join(__DIR__, '..', 'vendor', 'gems', 'environment'))
-
-Bundler.require_env
-
 require 'logger'
 require 'digest/md5'
 
+require 'simple-rss'
+require 'json'
+require 'crack'
+require 'moneta'
+require 'restclient'
+
 module Smoke  
   class << self
     @@active_sources = {}
@@ -31,6 +32,11 @@ module Smoke
       active_sources[source]
     end
     
+    # Access registered smoke source instances
+    def method_missing(sym)
+      self[sym]
+    end
+    
     # Activates new instances of sources
     # Source instances are stored within the 
     # @@active_sources class variable for later use

data/lib/smoke/request.rb

@@ -15,36 +15,31 @@ module Smoke
       :accept_encoding  => "gzip"
     }
     
-    attr_reader :uri, :content_type, :body, :type
+    attr_reader :uri, :content_type, :body
        
     def initialize(uri, options = {})
       @uri, @options = uri, options
       dispatch
     end
     
+    def type
+      @type ||= @options[:type] || (SUPPORTED_TYPES.detect{|t| @content_type =~ /#{t}/ } || "unknown").to_sym
+    end
+    
     private
     def dispatch
       get = Smoke::Cache.fetch @uri, @@request_options
       @body = get[:body]
       @content_type = get[:content_type]
       
-      present! unless @options[:raw_response]
+      parse! unless @options[:raw_response]
       
     rescue RestClient::Exception => e
       Failure.new(@uri, e)
     end
     
-    def present!
-      set_type
-      parse!
-    end
-    
-    def set_type
-      @type =  @options[:type] || (SUPPORTED_TYPES.detect{|t| @content_type =~ /#{t}/ } || "unknown").to_sym
-    end
-    
     def parse!
-      case @type
+      case type
         when :json, :javascript
           @body = ::Crack::JSON.parse(@body).symbolize_keys!
         when :xml

data/spec/smoke_spec.rb

@@ -8,7 +8,17 @@ describe Smoke do
   
   describe "active sources" do
     it "should allow access to sources via an array accessor" do
-      Smoke[:a].should be_an_instance_of(Smoke::Origin)
+      Smoke[:a].should == @source_a
+    end
+    
+    describe "accessing via method call" do
+      it "should allow access to the sources via a method call" do
+        Smoke.a.should == @source_a 
+      end
+      
+      it "should throw an argument error when missing" do
+        Smoke.b.should raise_error(NoMethodError)
+      end
     end
     
     it "should be able to be renamed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-smoke
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,6 @@ files:
 - spec/supports/test_source.rb
 has_rdoc: false
 homepage: http://github.com/benschwarz/smoke
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -159,10 +158,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
-summary: smoke is a DSL that allows you to take data from YQL, RSS / Atom
+summary: smoke is a Ruby based DSL that allows you to query web services such as YQL, RSS / Atom and JSON or XML in an elegant manner.
 test_files: 
 - spec/core_ext/hash_spec.rb
 - spec/smoke/cache_spec.rb