jsonr 0.0.2 → 0.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jiri Zajpt
+Copyright (c) 2010 Jiri Zajpt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/jzajpt/jsonr"
     gem.authors = ["Jiri Zajpt"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency('activesupport', '>= 3.0.0.beta4')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -18,21 +19,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-# require 'spec/rake/spectask'
-# Spec::Rake::SpecTask.new(:spec) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.spec_files = FileList['spec/**/*_spec.rb']
-# end
-#
-# Spec::Rake::SpecTask.new(:rcov) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-# end
-#
-# task :spec => :check_dependencies
-#
-# task :default => :spec
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'rails', 'init')

data/jsonr.gemspec

@@ -0,0 +1,62 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jsonr}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jiri Zajpt"]
+  s.date = %q{2010-07-16}
+  s.description = %q{A replacement for RJS templates using JSON.}
+  s.email = %q{jzajpt@blueberryapps.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "init.rb",
+     "jsonr.gemspec",
+     "lib/jsonr.rb",
+     "lib/jsonr/generator.rb",
+     "lib/jsonr/template_handler.rb",
+     "rails/init.rb",
+     "spec/jsonr_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jzajpt/jsonr}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A replacement for RJS templates using JSON.}
+  s.test_files = [
+    "spec/jsonr_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+  end
+end
+

data/lib/jsonr.rb

@@ -1,2 +1,9 @@
 require 'jsonr/generator'
-require 'jsonr/template_handler'
+
+if defined?(::ActionView)
+  require 'jsonr/template_handler'
+
+  # Hook into ActionView, register jsonr extension.
+  ::ActionView::Template.register_template_handler :jsonr, Jsonr::TemplateHandler
+end
+

data/lib/jsonr/generator.rb

@@ -1,5 +1,8 @@
 # Jsonr
 
+require 'active_support/ordered_hash'
+require 'active_support/json'
+
 module Jsonr
 
   class Generator
@@ -11,7 +14,7 @@ module Jsonr
 
     # Convert to a JSON string representation.
     def to_s
-      @commands.to_json
+      ActiveSupport::JSON.encode(@commands)
     end
 
     # Replaces a content of an element with given selector with given value.
@@ -93,7 +96,7 @@ module Jsonr
     #  page.flash :notice, "A person detail's were updated."
     #
     def flash(severity, message)
-      @commands[:flash] ||= {}
+      @commands[:flash] ||= ActiveSupport::OrderedHash.new
       @commands[:flash][severity] = message
     end
 
@@ -144,6 +147,11 @@ module Jsonr
       @commands[:remove].push *selectors
     end
 
+    # Sets given +key+ to a given +value+. Useful for passing custom objects.
+    #
+    # Example:
+    #
+    #  page.data :person, @person
     def data(key, value)
       @commands[key] = value
     end

data/lib/jsonr/template_handler.rb

@@ -1,8 +1,8 @@
 module Jsonr
 
-  class TemplateHandler < ActionView::TemplateHandler
+  class TemplateHandler < ::ActionView::TemplateHandler
 
-    include ActionView::TemplateHandlers::Compilable
+    include ::ActionView::TemplateHandlers::Compilable
 
     def compile(template)
       "@template_format = :html;" +

data/rails/init.rb

@@ -1,4 +1 @@
-require 'jsonr'
-
-# Hook into ActionView, register jsonr extension.
-ActionView::Template.register_template_handler :jsonr, Jsonr::TemplateHandler
+require 'jsonr'

data/spec/jsonr_spec.rb

@@ -1,7 +1,97 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Jsonr" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe "Jsonr::Generator" do
+
+  context "an empty generator instance" do
+
+    it "converts to empty json object" do
+      generator = Jsonr::Generator.new
+      generator.to_s.should == '{}'
+    end
+
+  end
+
+  context "#redirect_to" do
+
+    it "converts to json object with redirect_to key" do
+      generator = Jsonr::Generator.new do |page|
+        page.redirect_to '/new/url'
+      end
+
+      generator.to_s.should == %Q|{"redirect_to":"/new/url"}|
+    end
+
+  end
+
+  context "#flash" do
+
+    it "converts to json object with flash key" do
+      generator = Jsonr::Generator.new do |page|
+        page.flash :notice, "it's done!"
+      end
+
+      generator.to_s.should == %Q|{"flash":{"notice":"it's done!"}}|
+    end
+
+    it "converts all flashes" do
+      generator = Jsonr::Generator.new do |page|
+        page.flash :notice, "it's done!"
+        page.flash :error, "no it's not!"
+      end
+
+      generator.to_s.should == %Q|{"flash":{"notice":"it's done!","error":"no it's not!"}}|
+    end
+
   end
+
+  %w(hide show toggle remove).each do |cmd|
+
+    context "##{cmd}" do
+
+      it "convert to json object with hide key" do
+        generator = Jsonr::Generator.new do |page|
+          page.send cmd, '#selector1'
+        end
+
+        generator.to_s.should == %Q|{"#{cmd}":["#selector1"]}|
+      end
+
+      it "convert all given selectors" do
+        generator = Jsonr::Generator.new do |page|
+          page.send cmd, '#selector1', '.selector2'
+        end
+
+        generator.to_s.should == %Q|{"#{cmd}":["#selector1",".selector2"]}|
+      end
+
+      it "convert all given selectors when called more times" do
+        generator = Jsonr::Generator.new do |page|
+          page.send cmd, '#selector1'
+          page.send cmd, '.selector2'
+        end
+
+        generator.to_s.should == %Q|{"#{cmd}":["#selector1",".selector2"]}|
+      end
+
+    end
+
+  end
+
+
+  %w(replace append prepend replace_with insert_before).each do |cmd|
+
+    context "##{cmd}" do
+
+      it "convert to json object with #{cmd} key" do
+        generator = Jsonr::Generator.new do |page|
+          page.send(cmd, "#selector1", "content")
+        end
+
+        generator.to_s.should == %Q|{"#{cmd}":{"#selector1":"content"}}|
+      end
+
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'jsonr'
 require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jiri Zajpt
@@ -34,6 +34,23 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -1848230024
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  type: :runtime
+  version_requirements: *id002
 description: A replacement for RJS templates using JSON.
 email: jzajpt@blueberryapps.com
 executables: []
@@ -50,6 +67,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- init.rb
+- jsonr.gemspec
 - lib/jsonr.rb
 - lib/jsonr/generator.rb
 - lib/jsonr/template_handler.rb