RubyGems - mascut - Versions diffs - 0.0.4 → 0.0.5 - Mend

mascut 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/HISTORY.rdoc CHANGED

@@ -1,3 +1,7 @@
+= 0.0.5
+* start to write specs (partially)
+* you can use local jquery with -j option
 = 0.0.4
 * remove sinatra dependency, mascut is now a Rack middleware (use Mascut::Mascut)
 * add command line option

data/Rakefile CHANGED

@@ -4,14 +4,15 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = 'mascut'
-    gem.summary = 'instant comet-like server in order to debug web pages'
+    gem.name        = 'mascut'
+    gem.summary     = 'instant comet-like server in order to debug web pages'
     gem.description = 'instant comet-like server in order to debug web pages'
-    gem.email = 'okitakunio@gmail.com'
-    gem.homepage = 'http://github.com/okitan/mascut'
-    gem.authors = %w[ okitan ]
+    gem.email       = 'okitakunio@gmail.com'
+    gem.homepage    = 'http://github.com/okitan/mascut'
+    gem.authors     = %w[ okitan ]
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
+    gem.add_development_dependency 'rr', '>= 0.10.11'
+    gem.add_development_dependency 'rspec', '>= 1.3.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.0.4
1	+ 0.0.5

data/lib/mascut/mascut.rb CHANGED

@@ -16,11 +16,9 @@ module Mascut
           body = [ File.read(body.path) ] if body.is_a?(Rack::File)
           body.map! {|html| mascutize(html) }
           headers['Content-Length'] = body.to_a.inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
-          [ status, headers, [mascutize(body.first)] ]
-        else
-          [ status, headers, body ]
         end
+        [ status, headers, body ]
       end
     end
@@ -39,7 +37,22 @@ module Mascut
     def mascutize(html)
       # I don't use html parser like nokogiri, because it corrects html to be debugged
-      html.sub('</head>', <<-JS)
+      html.sub('</head>', @opts[:jquery] ? <<-LOCAL : <<-REMOTE)
+  <script src='#{@opts[:jquery]}'></script>
+  <script>
+var comet = function() {
+  $.ajax({
+    type: 'GET',
+    url:  '#{@path}',
+    success: function(msg) {
+      msg == 'reload' ? location.reload() : comet();
+    }
+  });
+}
+$(document).ready(comet);
+  </script>
+</head>
+      LOCAL
   <script src='http://www.google.com/jsapi'></script>
   <script>
 var comet = function() {
@@ -56,7 +69,7 @@ google.load('jquery', '1');
 google.setOnLoadCallback(comet);
   </script>
 </head>
-      JS
+      REMOTE
     end
   end
 end

data/lib/mascut/option.rb CHANGED

@@ -38,6 +38,10 @@ module Mascut
           opts.on('-i', '--interval SEC', Float, 'interval to monitor files(default on Mascut::Mascut: 1.0 sec)') do |sec|
             options[:interval] = sec
           end
+          opts.on('-j', '--jquery JQUERY', 'jquery file to use for commet') do |file|
+            options[:jquery] = file
+          end
           opts.permute!(args)
           options[:files] = args.size > 0 ? args : nil

data/spec/mascut/mascut_spec.rb ADDED

@@ -0,0 +1,124 @@
+require File.join(File.dirname(__FILE__), %w[ .. spec_helper ])
+describe Mascut::Mascut, '#new' do
+  context 'called with only an app' do
+    let(:app) { nil }
+    subject { Mascut::Mascut.new(app) }
+    before do
+      # Dir.chdir(tmpdir)
+      # tmpdir has some files
+    end
+    after do
+      # Dir.chdir(currentdir)
+      # delete tmpdir
+    end
+    it 'should assign @path with default value /mascut' do
+      subject.instance_variable_get(:@path).should == '/mascut'
+    end
+    it %(should assign @files with default value Dir['**/*']) do
+      pending 'I should change Dir to tmpdir'
+    end
+    it 'should assign @opts with default value {}' do
+      subject.instance_variable_get(:@opts).should == {}
+    end
+  end
+end
+describe Mascut::Mascut, '#call' do
+  let(:app) { mock }
+  let(:files) { [ ] }
+  let(:middleware) { Mascut::Mascut.new(app, '/mascut', files, {}) }
+  subject { middleware.call('PATH_INFO' => path)  }
+  let(:html) { '<html><head></head><body></body>' }
+  context 'if path is not mascut' do
+    let(:path) { '/hoge.html' }
+    let(:html) { '<html><head></head><body></body>' }
+    it 'app should be called' do
+      mock(app).call('PATH_INFO' => path)
+      subject
+    end
+    context 'if app returns html with status 200' do
+      before do
+        stub(app).call { [ 200, { 'Content-Type' => 'text/html' }, [ html ] ] }
+      end
+      it 'should call mascutize' do
+        mock(middleware).mascutize(html) { 'mascutized' }
+        subject
+      end
+      it 'should also returns 200' do
+        subject[0].should == 200
+      end
+      it 'should add updated content length' do
+        stub(middleware).mascutize(html) { '12characters' }
+        subject[1].should include('Content-Length' => 12.to_s )
+      end
+      it 'should return mascutized values' do
+        mock(middleware).mascutize(html) { 'mascutized' }
+        subject[2].should == [ 'mascutized' ]
+      end
+    end
+    [ [ 201, { 'Content-Type' => 'text/html' }, [ 'html' ] ],
+      [ 200, { 'Content-Type' => 'text/css'  }, [ 'css'  ] ],
+    ].each do |response|
+      context "when status is #{response[0]} and Content-Type is #{response[1]['Content-Type']}" do
+        before do
+          stub(app).call { response }
+        end
+        it 'should return as is' do
+          subject.should == response
+        end
+      end
+    end
+  end
+  context 'if path is mascut' do
+    let(:path) { '/mascut' }
+    it 'should wait until the files are updated' do
+      pending 'thread and benchmark'
+    end
+  end
+end
+describe Mascut::Mascut, '#mascut' do
+  it 'should have specs'
+end
+describe Mascut::Mascut, '#mascutize' do
+  let(:app) { mock }
+  let(:html) { '<html><head></head><body></body>' }
+  subject { Mascut::Mascut.new(app, nil, nil, opts).mascutize(html) }
+  context 'if use local jquery' do
+    let(:jquery) { 'jquery_file' }
+    let(:opts) { { :jquery => jquery } }
+    it "should include local jquery path" do
+      subject.should =~ /#{jquery}/
+    end
+  end
+  context 'if use remote jquery' do
+    let(:opts) { {} }
+    it 'should load jquery from google' do
+      subject.should =~ /http:\/\/www\.google\.com\/jsapi/
+    end
+  end
+end

data/spec/mascut/option_spec.rb ADDED

@@ -0,0 +1,94 @@
+require File.join(File.dirname(__FILE__), %w[ .. spec_helper ])
+describe Mascut::Option, '#parse' do
+  subject { Mascut::Option.parse(args) }
+  let(:value) { 'value' }
+  context 'String option' do
+    [ %w[ -s --server server ],
+      %w[ -o --host   Host ],
+      %w[ -j --jquery jquery],
+    ].each do |short, long, key|
+      context "with short option #{short}" do
+        let(:args) { [ short, value ] }
+        it "should assign #{key}" do
+          subject[key.to_sym].should == value
+        end
+      end
+      context "with long option #{long}" do
+        it 'should have specs'
+      end
+    end
+    context '-m --mascut' do
+      context 'with short option -m' do
+        it 'should assign mascut and add its head /' do
+          Mascut::Option.parse(%w[ -m mascut ])[:mascut].should == '/mascut'
+        end
+        it 'should assign mascut and add its head /' do
+          Mascut::Option.parse(%w[ -m /mascut ])[:mascut].should == '/mascut'
+        end
+      end
+      context 'with long option --mascut' do
+        it 'should have specs'
+      end
+    end
+  end
+  context 'Integer option' do
+    [ %w[ -p --port Port ],
+    ].each do |short, long, key|
+      # XXX: now default value is Integer but parsed value is String
+      it 'should have specs'
+    end
+  end
+  context 'Float option' do
+    [ %w[ -i --interval interval],
+    ].each do |short, long, key|
+      it 'should have specs'
+    end
+  end
+  # returns true/false
+  context 'boolean option' do
+    [
+      %w[ -D --daemonize daemonize],
+    ].each do |short, long, key|
+      it 'should have specs'
+    end
+  end
+  # out of options
+  context 'not options' do
+    let(:args) { %w[ file1 file2 ] }
+    it 'should be assigned to files' do
+      subject[:files].should == args
+    end
+  end
+  context 'invalid options' do
+    it 'should have specs'
+  end
+  # default values
+  [ [ :server, 'mongrel' ],
+    [ :Host,   '0.0.0.0' ],
+    [ :Port,   9203 ],
+    [ :files,  nil ],
+  ].each do |key, default_value|
+    context "when #{key} is not specified" do
+      let(:args) { [] }
+      it 'should be assigned default value' do
+        subject[key].should == default_value
+      end
+    end
+  end
+end

data/spec/mascut_spec.rb CHANGED

@@ -1,7 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.join(File.dirname(__FILE__), 'spec_helper')
-describe "Mascut" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
+describe Mascut::VERSION do
+  it { should =~ /^\d+\.\d+\.\d+(\w+)?$/ }
 end

data/spec/spec_helper.rb CHANGED

@@ -1,9 +1,10 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$: << File.join(File.dirname(__FILE__), %w[ .. lib ])
 require 'mascut'
-require 'spec'
-require 'spec/autorun'
+require 'rubygems'
+require 'rack'
+require 'rr'
 Spec::Runner.configure do |config|
+  config.mock_with :rr
 end

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors:
 - okitan
@@ -14,23 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-12 00:00:00 +09:00
+date: 2010-05-24 00:00:00 +09:00
 default_executable: mascut
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         segments:
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 10
+        - 11
+        version: 0.10.11
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id002
 description: instant comet-like server in order to debug web pages
 email: okitakunio@gmail.com
 executables:
@@ -52,6 +66,8 @@ files:
 - lib/mascut.rb
 - lib/mascut/mascut.rb
 - lib/mascut/option.rb
+- spec/mascut/mascut_spec.rb
+- spec/mascut/option_spec.rb
 - spec/mascut_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -86,5 +102,7 @@ signing_key:
 specification_version: 3
 summary: instant comet-like server in order to debug web pages
 test_files:
+- spec/mascut/mascut_spec.rb
+- spec/mascut/option_spec.rb
 - spec/spec_helper.rb
 - spec/mascut_spec.rb