pushify 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/pushify

@@ -30,6 +30,7 @@ else
     print "Installing Pushify..."
     Pushify::Install.install!
     puts "success!"
+
     ARGV.clear
     ARGV.push("start")
   end
@@ -40,11 +41,12 @@ else
     print "Stopping pushify server..."
     system("kill #{File.read(pid)}")
     system("rm #{pid}")
+    system("killall pushify_server.rb")
   else
     print "Starting pushify server..."
     config = File.exist?("config/juggernaut.yml") ? "config/juggernaut.yml" : File.join(File.dirname(__FILE__), "..", "install", "juggernaut.yml")
     system("juggernaut -c#{config} -d -P #{pid}")
+    Daemons.run_proc(File.join(pids, 'pushify_server.rb')) { Pushify::Server.run }
   end
-  Daemons.run_proc(File.join(pids, 'pushify_server.rb')) { Pushify::Server.run }
   puts "success!"
 end

data/lib/pushify/install.rb

@@ -19,7 +19,14 @@ module Pushify
       return false if File.open('Gemfile', 'r').read.match(/\s*gem\s+['"]pushify['"]/)
       
       File.open('Gemfile', 'a') do |f|
-        f.write("\n\ngem 'pushify'\n")
+        f.write("\n\ngroup :development do\n  gem 'pushify'\nend\n")
+      end
+      
+      split_on = "Demo3::Application.configure do"
+      parts = File.read('config/environments/development.rb').split(split_on)
+      
+      File.open('config/environments/development.rb', "w") do |f|
+        f.puts parts.join(split_on + "\n\n  config.middleware.use Pushify::Rack")
       end
       true
     end

data/lib/pushify/rack.rb

@@ -6,17 +6,17 @@ module Pushify
     
     def call(env)
       path = env["REQUEST_URI"]
+
       if (Pushify::Rails::Assets.includes?(path))
         Pushify::Rails::Assets.response(path)
       else
         status, headers, response = @app.call(env)
 
         is_html = !response.is_a?(Array) && (headers["Content-Type"].nil? || headers["Content-Type"].include?("text/html"))
-
         if (is_html && response.body.match(/<\/body>/))
           pushify_src = Pushify.javascript_src
           response.body = response.body.gsub(/(<\/body>)/, "#{pushify_src}</body>")
-          headers["Content-Length"] = (headers["Content-Length"].to_i + pushify_src.size).to_s
+          headers["Content-Length"] = (response.body.size).to_s
         end
 
         [status, headers, response]

data/lib/pushify/rails.rb

@@ -6,8 +6,11 @@ module Pushify
     def self.initialize
       ActionView::Base.send(:include, Pushify::Helper)
       
-      if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
-        ::Rails.configuration.middleware.use("Pushify::Rack")
+
+      if (::Rails.version.start_with?("2"))
+        if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
+          ::Rails.configuration.middleware.use("Pushify::Rack")
+        end
       end
     end
     
@@ -39,12 +42,17 @@ module Pushify
         end
       end
       
+      def self.just_the_path(path)
+        m = path.match(/https?:\/\/[-A-Za-z0-9\.:]*(\/.*)/)
+        m ? m[1] : path
+      end
+      
       def self.includes?(path)
-        self.assets.keys.include?(path)
+        self.assets.keys.include?(just_the_path(path))
       end
       
       def self.response(path)
-        asset = self.assets[path]
+        asset = self.assets[just_the_path(path)]
         [200, {"Content-Type" => asset[0]}, [self.asset_body(asset[1])]]
       end
     end

data/pushify.gemspec

@@ -1,6 +1,6 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -15,34 +15,33 @@ Gem::Specification.new do |s|
   s.executables = ["pushify"]
   s.files = [
     ".specification",
-     "LICENSE",
-     "README.markdown",
-     "ROADMAP",
-     "Rakefile",
-     "VERSION",
-     "bin/pushify",
-     "install/expressinstall.swf",
-     "install/json.js",
-     "install/juggernaut.js",
-     "install/juggernaut.swf",
-     "install/juggernaut.yml",
-     "install/juggernaut_hosts.yml",
-     "install/pushify.js",
-     "install/swfobject.js",
-     "lib/pushify.rb",
-     "lib/pushify/helper.rb",
-     "lib/pushify/install.rb",
-     "lib/pushify/juggernaut.rb",
-     "lib/pushify/rack.rb",
-     "lib/pushify/rails.rb",
-     "lib/pushify/server.rb",
-     "pkg/pushify-1.0.0.gem",
-     "pushify.gemspec",
-     "spec/css_push_spec.rb",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.markdown",
+    "ROADMAP",
+    "Rakefile",
+    "VERSION",
+    "bin/pushify",
+    "install/expressinstall.swf",
+    "install/json.js",
+    "install/juggernaut.js",
+    "install/juggernaut.swf",
+    "install/juggernaut.yml",
+    "install/juggernaut_hosts.yml",
+    "install/pushify.js",
+    "install/swfobject.js",
+    "lib/pushify.rb",
+    "lib/pushify/helper.rb",
+    "lib/pushify/install.rb",
+    "lib/pushify/juggernaut.rb",
+    "lib/pushify/rack.rb",
+    "lib/pushify/rails.rb",
+    "lib/pushify/server.rb",
+    "pkg/pushify-1.0.0.gem",
+    "pushify.gemspec",
+    "spec/css_push_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/tilleryj/pushify}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{See updates you make to css, html, javascript, and images appear immediately in all of your browsers without having to refresh.}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pushify
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jason Tillery
@@ -59,8 +59,8 @@ homepage: http://github.com/tilleryj/pushify
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement