fakesite 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed01cfab014f5c03eae99b94cc2b9f923e27ca3d
-  data.tar.gz: d76f37ae83521989ad734a05aee6a9e2f79752a8
+  metadata.gz: b4a6737c927d755be8406368ff176f4c3cf9ce65
+  data.tar.gz: 011fd9790e39111d23e25480368d916a7f25fcaf
 SHA512:
-  metadata.gz: e965244a24792f39df467f7ea7c0056f64905ae0969ebe903370a67d9cf5d83aa1177d7d5cb8fbd91da1fa852180efc815b7ef6ce9c5d89ea0d857a050459f37
-  data.tar.gz: de9c46dd58b591b7e50874f28649888b412b222531f4bf56045947267bb0853961af32291fcb5145d53a720fde784e8d0bb91e24490f02682fec45e1ffb29832
+  metadata.gz: 4c0ff60e11de2e4b8f4217f5ed59ff7ccff51cba69711ff0be735096121cb326f7f94f025072429d0252c33ac55d57843f3004c246dd0c61ce984db333414878
+  data.tar.gz: 5edc5ab2dcb21a3e6138128f8266aedb74224d0684e54b786771f223b4fbbedea32d1260eed990e226b365707ec5472f6853dc68e48077ffcb3845e481ca7704

data/app/controllers/fakesite/fakesites_controller.rb

@@ -7,18 +7,13 @@ module Fakesite
       @id = params[:id]
       @fakesite = @registration.create
       @fakesite.external_uri = @uri
-      key = params[:key]
-      if key
-        @fakesite.user = Rails.cache.fetch(key)
-        Rails.cache.delete(key)
-        @fakesite.reload_user
-      end
+      setup_user
     end
 
     def redirect
       @fakesite = @registration.deserialize(params[:serialization])
-      @fakesite.reload_user
       @fakesite.params = params[:p]
+      setup_user
       redirect_to @fakesite.redirect_url
     end
 
@@ -27,5 +22,9 @@ module Fakesite
     def find_registration
       @registration = Fakesite.find(params[:id])
     end
+
+    def setup_user
+      @fakesite.user = current_user if respond_to? :current_user
+    end
   end
 end

data/lib/fakesite.rb

@@ -4,8 +4,6 @@ require "fakesite/base"
 require "fakesite/registration"
 
 module Fakesite
-  CacheKey = "fakesite"
-
   @@initialized = false
   @@registrations = {}
 
@@ -31,10 +29,6 @@ module Fakesite
     @@registrations[id.to_sym]
   end
 
-  def self.generate_cache_key
-    "#{CacheKey}:#{Time.now.to_i}"
-  end
-
   private
 
   def self.initialize

data/lib/fakesite/action_controller.rb

@@ -5,11 +5,7 @@ if defined?(::Rails::Engine)
     def redirect_to(options = {}, response_status = {})
       id = Fakesite.match(options)
       if id
-        if respond_to? :current_user
-          key = Fakesite.generate_cache_key
-          Rails.cache.write(key, current_user) 
-        end
-        orig_redirect_to Fakesite::Engine.routes.url_helpers.fakesite_path(id, :url => options, :key => key)
+        orig_redirect_to Fakesite::Engine.routes.url_helpers.fakesite_path(id, :url => options)
       else
         orig_redirect_to(options, response_status)
       end

data/lib/fakesite/base.rb

@@ -25,11 +25,11 @@ module Fakesite
     end
 
     def serialize
-      YAML.dump(self)
-    end
-
-    def reload_user
-      user.reload if !user.nil? && user.respond_to?(:reload)
+      tmp = user
+      self.user = nil
+      serialization = YAML.dump(self)
+      self.user = tmp
+      serialization
     end
 
     def self.match(external_uri)

data/lib/fakesite/version.rb

@@ -1,3 +1,3 @@
 module Fakesite
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakesite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chen Yi-Cyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails