annal 0.0.2 → 0.0.3

data/annal.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "activesupport"
+  gem.add_runtime_dependency "rest-client"
 
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"

data/lib/annal/fetch.rb

@@ -1,20 +1,17 @@
+require 'annal/fetch/local_file'
+require 'annal/fetch/net_file'
+
 module Annal
-  class Fetch
-    attr_accessor :path, :file
-    def initialize(file_identifier)
-      self.file = if file_identifier.respond_to?(:read)
-        file_identifier
+  module Fetch
+    def self.new(file_identifier)
+      case file_identifier
+      when File
+        LocalFile.new(file_identifier)
+      when %r(https?://)
+        NetFile.new(file_identifier)
       else
-        File.open(file_identifier)
+        LocalFile.new(file_identifier)
       end
     end
-
-    def local?
-      true
-    end
-
-    def read
-      @read ||= file.read
-    end
   end
 end

data/lib/annal/fetch/local_file.rb

@@ -0,0 +1,22 @@
+module Annal
+  module Fetch
+    class LocalFile
+      attr_accessor :path, :file
+      def initialize(file_identifier)
+        self.file = if file_identifier.respond_to?(:read)
+          file_identifier
+        else
+          File.open(file_identifier)
+        end
+      end
+
+      def local?
+        true
+      end
+
+      def read
+        @read ||= file.read
+      end
+    end
+  end
+end

data/lib/annal/fetch/net_file.rb

@@ -0,0 +1,24 @@
+require 'rest_client'
+
+module Annal
+  module Fetch
+    class NetFile
+      attr_accessor :path, :file
+      def initialize(file_identifier)
+        self.file = if file_identifier.respond_to?(:read)
+          file_identifier
+        else
+          self.file = RestClient.get(file_identifier)
+        end
+      end
+
+      def local?
+        false
+      end
+
+      def read
+        @read ||= file.to_str
+      end
+    end
+  end
+end

data/lib/annal/parse.rb

@@ -8,7 +8,11 @@ module Annal
     end
 
     def data
-      parse_yaml
+      @data ||= parse_yaml
+    end
+
+    def parseable?
+      not data.kind_of?(String)
     end
 
     # Also parses JSON

data/lib/annal/version.rb

@@ -1,3 +1,3 @@
 module Annal
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/annal_integration_test.rb

@@ -12,10 +12,16 @@ class TestAnnalIntegration < MiniTest::Unit::TestCase
     assert_kind_of Hash, doc.data
   end
 
-  def test_find
+  def test_find_local
     doc = Annal::Document.find("#{Annal.project_root}/test/test.json")
     assert_kind_of Hash, doc.data
     assert_kind_of Hash, doc.data
   end
 
+  def test_find_net
+    doc = Annal::Document.find(json_url)
+    assert_kind_of Hash, doc.data
+    assert_kind_of Hash, doc.data
+  end
+
 end

data/test/annal_test.rb

@@ -8,5 +8,4 @@ class TestAnnal < MiniTest::Unit::TestCase
   def test_that_kitty_can_eat
     assert_kind_of Module, Annal
   end
-
 end

data/test/fetch_file_integration_spec.rb

@@ -0,0 +1,19 @@
+require_relative 'minitest_helper'
+
+class TestFetchLocalFileIntegration < MiniTest::Unit::TestCase
+  def subject
+    Annal::Fetch::LocalFile
+  end
+
+  def test_fetch
+    read = subject.new("#{Annal.project_root}/test/test.json").read
+    assert_match 'development_environment', read
+  end
+
+  def test_double_read
+    fetch = subject.new("#{Annal.project_root}/test/test.json")
+    assert_match 'development_environment', fetch.read
+    assert_match 'development_environment', fetch.read
+  end
+
+end

data/test/minitest_helper.rb

@@ -13,3 +13,29 @@ end
 def yaml_text
   IO.read("#{Annal.project_root}/test/test.yml")
 end
+
+def json_url
+ "https://gist.github.com/raw/07fc05e2d2ba3097e7d7/
+    2ef8ae00465c93b81f179d90e3b92a41eed73a81/
+    example.json".gsub(/\s+/,'')
+end
+
+def yaml_url
+  "https://gist.github.com/raw/d320232a2b2e97dd1bd6/
+    51a4dd459dc12673ad440debb28f499c89550022/
+    test.yml".gsub(/\s/,'')
+end
+
+def stub_rest_client!
+  require 'rest-client'
+  def RestClient.get(url)
+    case url
+    when json_url then json_text
+    when yaml_url then yaml_url
+    else
+      puts 'Unstubbed call to "RestClient.get"!'
+      super(url)
+    end
+  end
+end
+stub_rest_client! # Go ahead and call it! Homecooked before(:all)

data/test/{fetch_integration_spec.rb → net_file_integration_test.rb}

@@ -1,16 +1,23 @@
 require_relative 'minitest_helper'
 
-class TestFetchIntegration < MiniTest::Unit::TestCase
+class TestFetchNetFileIntegration < MiniTest::Unit::TestCase
+  def subject
+    Annal::Fetch::NetFile
+  end
 
   def test_fetch
-    read = Annal::Fetch.new("#{Annal.project_root}/test/test.json").read
+    read = subject.new(json_url).read
     assert_match 'development_environment', read
   end
 
   def test_double_read
-    fetch = Annal::Fetch.new("#{Annal.project_root}/test/test.json")
+    fetch = subject.new(json_url)
     assert_match 'development_environment', fetch.read
     assert_match 'development_environment', fetch.read
   end
 
+  # def test_crazy_pants
+  #   stub_rest_client!
+  # end
+
 end

data/test/parse_integration_test.rb

@@ -2,6 +2,10 @@ require_relative 'minitest_helper'
 
 class TestParseIntegration < MiniTest::Unit::TestCase
 
+  def plain_text
+    'Hi there. No format here.'
+  end
+
   def test_parsing_json
     data = Annal::Parse.new(json_text).data
     assert_kind_of Hash, data
@@ -13,7 +17,7 @@ class TestParseIntegration < MiniTest::Unit::TestCase
   end
 
   def test_parsing_text
-    data = Annal::Parse.new('Hi there. No format here.').data
+    data = Annal::Parse.new(plain_text).data
     assert_kind_of String, data
   end
 
@@ -23,4 +27,12 @@ class TestParseIntegration < MiniTest::Unit::TestCase
     assert_kind_of Hash, parse.data
   end
 
+  def test_detect_parsing_success
+    assert Annal::Parse.new(json_text).parseable?
+  end
+
+  def test_detect_parsing_failure
+    refute Annal::Parse.new(plain_text).parseable?
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70321319294640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321319294640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70321319293840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321319293840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321319292820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321319292820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Loads up files. Parses YAML/JSON and other stuff maybe.
 email:
 - samsm@samsm.com
@@ -62,13 +93,16 @@ files:
 - lib/annal/collection.rb
 - lib/annal/document.rb
 - lib/annal/fetch.rb
+- lib/annal/fetch/local_file.rb
+- lib/annal/fetch/net_file.rb
 - lib/annal/parse.rb
 - lib/annal/version.rb
 - test/annal_integration_test.rb
 - test/annal_test.rb
 - test/collection_integration_test.rb
-- test/fetch_integration_spec.rb
+- test/fetch_file_integration_spec.rb
 - test/minitest_helper.rb
+- test/net_file_integration_test.rb
 - test/parse_integration_test.rb
 - test/test-dir/.gitkeep
 - test/test.json
@@ -87,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -263292446635961119
+      hash: 3090640064352595291
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,10 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -263292446635961119
+      hash: 3090640064352595291
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A wrapper for text files.
@@ -107,8 +141,9 @@ test_files:
 - test/annal_integration_test.rb
 - test/annal_test.rb
 - test/collection_integration_test.rb
-- test/fetch_integration_spec.rb
+- test/fetch_file_integration_spec.rb
 - test/minitest_helper.rb
+- test/net_file_integration_test.rb
 - test/parse_integration_test.rb
 - test/test-dir/.gitkeep
 - test/test.json