inkit 0.0.12 → 0.0.13

data/lib/cache.rb

@@ -24,7 +24,9 @@ class Inkit
     private
     
     def filename(name)
-      @cache_dir+"/."+OpenSSL::HMAC::hexdigest("sha256",@secret,name.to_s)
+      a = File.extname name
+      b = File.basename name, a
+      @cache_dir+"/."+OpenSSL::HMAC::hexdigest("sha256",@secret,a.to_s)+a
     end
   end
 end

data/lib/inkit.rb

@@ -4,27 +4,12 @@ require 'cgi'
 require 'mustache'
 require 'time'
 
+load File.dirname(__FILE__)+"/utils.rb"
 load File.dirname(__FILE__)+"/cache.rb"
 
-class Hash
-  def to_query
-    map{|k,v| "#{::CGI.escape(k.to_s)}=#{::CGI.escape(v)}"}.join("&")
-  end
-end
-
-class String
-  def indent(n)
-    if n >= 0
-      gsub(/^/, ' ' * n)
-    else
-      gsub(/^ {0,#{-n}}/, "")
-    end
-  end
-end
-
 class Inkit
 
-  attr_accessor :token
+  attr_reader :token, :secret
 
   # Constructor
   def initialize(options)
@@ -34,29 +19,28 @@ class Inkit
     @cache = Cache.new(@secret)
   end
   
-  # Pull a view from the inkit api
   def digest(hash)
     OpenSSL::HMAC::hexdigest("sha256", @secret, hash.to_query)
   end
   
   def pull(view,type = 'haml')
-    data = {:view => view.to_s, :type => type}
+    data = {:view => view.to_s, :type => type, :timestamp => Time.now.rfc2822}
     data[:digest] = digest(data)
     data[:token] = @token
     uri = URI("http://inkit.org/api/document?"+data.to_query)
     req = ::Net::HTTP::Get.new uri.request_uri
-    if @cache.cached? view
-      req['If-Modified-Since'] = @cache.cached_at view
+    if @cache.cached? view+"."+type
+      req['If-Modified-Since'] = @cache.cached_at view+"."+type
     end
     res = ::Net::HTTP.start(uri.host, uri.port) {|http|
       http.request(req)
     }
     if res.is_a?(::Net::HTTPSuccess)
-      @cache[view] = res.body
-      return @cache[view]
+      @cache[view+"."+type] = res.body
+      return @cache[view+"."+type]
     end
     if res.is_a?(::Net::HTTPNotModified)
-      return @cache[view]
+      return @cache[view+"."+type]
     end
     raise res.code
   end

data/lib/utils.rb

@@ -0,0 +1,15 @@
+class Hash
+  def to_query
+    map{|k,v| "#{::CGI.escape(k.to_s)}=#{::CGI.escape(v)}"}.join("&")
+  end
+end
+
+class String
+  def indent(n)
+    if n >= 0
+      gsub(/^/, ' ' * n)
+    else
+      gsub(/^ {0,#{-n}}/, "")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inkit
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &74838360 !ruby/object:Gem::Requirement
+  requirement: &15001680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,16 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74838360
+  version_requirements: *15001680
 description: Client library to pull and render INK views.
 email: ink-support@hotmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./lib/inkit.rb
+- ./lib/utils.rb
 - ./lib/cache.rb
-- test/Gemfile.lock
-- test/Gemfile
-- test/config.ru
+- ./lib/inkit.rb
 homepage: http://inkit.org
 licenses: []
 post_install_message: 
@@ -53,11 +51,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client library for INK.
-test_files:
-- test/Gemfile.lock
-- test/Gemfile
-- test/config.ru
+test_files: []
+has_rdoc: 

data/test/Gemfile

@@ -1,2 +0,0 @@
-source :gemcutter
-gem 'inkit'

data/test/Gemfile.lock

@@ -1,12 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    inkit (0.0.11)
-      mustache
-    mustache (0.99.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  inkit

data/test/config.ru

@@ -1,12 +0,0 @@
-require "rubygems"
-require '../inkit'
-
-ink = Inkit.new({
-  :token => "egxM28qoFkP",
-  :secret => "QntGyT3P00T"
-})
-    
-run lambda { |env|
-  [200, {"Content-Type" => "text/plain"}, [ink.haml(:asd,{:layout => :test01})]]
-}
-