monad 0.0.1 → 0.0.2

data/README.md

@@ -1,18 +1,18 @@
 ## Monad
 
-Monad is a simple, blog aware, static site generator based on and 100% compatible with [Jekyll](https://github.com/mojombo/jekyll).
+Monad is a simple, blog aware, static site generator based on [Jekyll](https://github.com/mojombo/jekyll).
 
 The main feature it adds is as follows:
 
 - Support data sources
-- Support virtual posts from external sources(TBD)
+- Support posts from external sources(TBD)
 
 ## Data Sources
 
 Data Source enables you to load data from external sources, such as web, file system,
 databases and then use them inside views.
 
-Jekyll supports two built-in data sources:
+Monad supports two built-in data sources:
 
 - `YAML` from local file system
 - `JSON` from web
@@ -83,6 +83,6 @@ data_sources:
     type: xxx
 ```
 
-If the type is `xxx`, Jekyll assumes the corresponding driver is `Monad::Drivers::XxxDriver`. If the type is `xxx_yyy`, the driver should be `Monad::Drivers::XxxYyyDriver`, and so on.
+If the type is `xxx`, Monad assumes the corresponding driver is `Monad::Drivers::XxxDriver`. If the type is `xxx_yyy`, the driver should be `Monad::Drivers::XxxYyyDriver`, and so on.
 
 Beside the obligatory `name` and `type` options, you can define any more options to be used inside the driver.

data/lib/monad.rb

@@ -57,7 +57,7 @@ require_all 'monad/drivers'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Monad
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   # Public: Generate a Monad configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/monad/filters.rb

@@ -138,6 +138,15 @@ module Monad
       end
     end
 
+    # Convert the input into json string
+    #
+    # input - The Array of Hash to be converted
+    #
+    # Returns the converted json string
+    def json(input)
+      input.to_json
+    end
+
     private
     def time(input)
       case input

data/monad.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'monad'
-  s.version           = '0.0.1'
+  s.version           = '0.0.2'
   s.license           = 'MIT'
-  s.date              = '2013-05-13'
+  s.date              = '2013-07-02'
 
   s.summary     = "A simple, blog aware, static site generator based on jekyll."
   s.description = "Monad is a simple, blog aware, static site generator based on jekyll."
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', "~> 10.0.3")
   s.add_development_dependency('rdoc', "~> 3.11")
   s.add_development_dependency('redgreen', "~> 1.2")
+  s.add_development_dependency('webmock', "~> 1.9.3")
   s.add_development_dependency('shoulda', "~> 3.3.2")
   s.add_development_dependency('rr', "~> 1.0")
   s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
@@ -47,7 +48,6 @@ Gem::Specification.new do |s|
 
   # = MANIFEST =
   s.files = %w[
-    CONTRIBUTING.md
     Gemfile
     LICENSE
     README.md

data/test/helper.rb

@@ -7,7 +7,6 @@ end
 require 'rubygems'
 require 'test/unit'
 require 'ostruct'
-gem 'RedCloth', '>= 4.2.1'
 
 require 'monad'
 
@@ -20,6 +19,10 @@ require 'redgreen' if RUBY_VERSION < '1.9'
 require 'shoulda'
 require 'rr'
 
+require 'webmock'
+include WebMock::API
+WebMock.allow_net_connect!
+
 include Monad
 
 # Send STDERR into the void to suppress program output messages

data/test/test_filters.rb

@@ -98,5 +98,9 @@ class TestFilters < Test::Unit::TestCase
     should "escape space as %20" do
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
+
+    should "convert object to json" do
+      assert_equal "{\"name\":\"test\"}", @filter.json({name: "test"})
+    end
   end
 end

data/test/test_json_driver.rb

@@ -37,7 +37,8 @@ class TestJsonDriver < Test::Unit::TestCase
 
       should 'throw exception if server returns non-json content' do
         assert_raise JSON::ParserError do
-          Monad::Drivers::JsonDriver.new('url' => 'http://www.wikipedia.org/').load
+          stub_http_request(:get, 'http://test.com/').to_return(body: 'hello, world')
+          Monad::Drivers::JsonDriver.new('url' => 'http://test.com/').load
         end
       end
     end
@@ -45,17 +46,19 @@ class TestJsonDriver < Test::Unit::TestCase
     context 'correct input and correct environment' do
       should 'handle http request correctly' do
         assert_nothing_raised do
-          data = Monad::Drivers::JsonDriver.new('url' => 'http://jsonip.com/').load
-          assert_not_nil data['ip']
-          assert_not_nil data['about']
+          stub_http_request(:get, 'http://test.com/').to_return(body: '{"ip": "127.0.0.1"}')
+
+          data = Monad::Drivers::JsonDriver.new('url' => 'http://test.com/').load
+          assert_equal data['ip'], '127.0.0.1'
         end
       end
 
       should 'handle https request correctly' do
         assert_nothing_raised do
-          data = Monad::Drivers::JsonDriver.new('url' => 'https://maps.googleapis.com/maps/api/geocode/json').load
-          assert_not_nil data['results']
-          assert_not_nil data['status']
+          stub_http_request(:get, 'https://test.com/').to_return(body: '{"city": "Nanjing"}')
+
+          data = Monad::Drivers::JsonDriver.new('url' => 'https://test.com/').load
+          assert_equal data['city'], 'Nanjing'
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monad
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -203,6 +203,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +378,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -518,9 +533,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -435190587127129160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -529,7 +541,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator based on jekyll.

data/CONTRIBUTING.md

@@ -1,68 +0,0 @@
-Contribute
-==========
-
-So you've got an awesome idea to throw into Jekyll. Great! Please keep the
-following in mind:
-
-* **Contributions will not be accepted without tests.**
-* If you're creating a small fix or patch to an existing feature, just a simple
-  test will do. Please stay in the confines of the current test suite and use
-  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and
-  [RR](http://github.com/btakita/rr/tree/master).
-* If it's a brand new feature, make sure to create a new
-  [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
-  where appropriate. Also, whipping up some documentation in your fork's wiki
-  would be appreciated, and once merged it will be transferred over to the main
-  wiki.
-* If your contribution changes any Jekyll behavior, make sure to update the
-  documentation. It lives in `site/_posts`. If the docs are missing information,
-  please feel free to add it in. Great docs make a great project!
-* Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
-  when modifying Ruby code.
-
-Test Dependencies
------------------
-
-To run the test suite and build the gem you'll need to install Jekyll's
-dependencies. Jekyll uses Bundler, so a quick run of the bundle command and
-you're all set!
-
-    $ bundle
-
-Before you start, run the tests and make sure that they pass (to confirm your
-environment is configured properly):
-
-    $ rake test
-    $ rake features
-
-Workflow
---------
-
-Here's the most direct way to get your work merged into the project:
-
-* Fork the project.
-* Clone down your fork ( `git clone git@github.com:<username>/jekyll.git` ).
-* Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ).
-* Hack away, add tests. Not necessarily in that order.
-* Make sure everything still passes by running `rake`.
-* If necessary, rebase your commits into logical chunks, without errors.
-* Push the branch up ( `git push origin my_awesome_feature` ).
-* Create a pull request against mojombo/jekyll and describe what your change
-  does and the why you think it should be merged.
-
-Gotchas
--------
-
-* If you want to bump the gem version, please put that in a separate commit.
-  This way, the maintainers can control when the gem gets released.
-* Try to keep your patch(es) based from the latest commit on mojombo/jekyll.
-  The easier it is to apply your work, the less work the maintainers have to do,
-  which is always a good thing.
-* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers
-  actively read the issues and will label it once they come across it.
-
-Finally...
-----------
-
-Thanks! Hacking on Jekyll should be fun. If you find any of this hard to figure
-out, let us know so we can improve our process or documentation!