storytime 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce93e4ab853cc098d00f512e8bfd2a51a3ebadf0
-  data.tar.gz: b4bfb448598b1d111ed8b4eb2a94be1247f4752e
+  metadata.gz: 7da5ec2a69055bd166a14205820528edf94514e1
+  data.tar.gz: 099cc4cc4daea49712f28f9897dcbb8d5f1d73bc
 SHA512:
-  metadata.gz: daa1067db8c189c63ba356c80f4a430f7f340481c356090fbafa542f38bcdb6e91ea1394f9b262c6f0656f04883b902c3fb3d94a0973f0163e8cb70918174753
-  data.tar.gz: b530720dc00efa5af46428c89c030e764b4f40538887c1e2d361e367114d784031949dacbd0f063f12f44b4226618fed3647e46ce25edac09273743333d37bd2
+  metadata.gz: dd87c30584ead79de6617c101664071d209b4287edf26169adc453c5456b0bdd7072e397d4b53fffbfdd79b3ff2a8990c5b24330d23059aa872b1528da445870
+  data.tar.gz: f141dd781c0d0e5027400b410debc21a01430896f8224f8186a5ecf7a5d48ff60324382c735c9d740f31d608ec4aa132ba01290d09df590822118f2d4ffc3a31

data/config/initializers/url_for_patch.rb

@@ -1,8 +1,8 @@
 module ActionDispatch
   module Routing
     class RouteSet
-      
-      def url_for_with_storytime(options = {})
+
+      def handle_storytime_urls(options)
         if options[:controller] == "storytime/posts" && options[:action] == "index"
           options[:use_route] = "root_post_index" if Storytime::Site.first.root_page_content == "posts"
         elsif options[:controller] == "storytime/posts" && options[:action] == "show"
@@ -35,14 +35,22 @@ module ActionDispatch
             end
           end
         end
-
-        url_for_without_storytime(options)
-      rescue Exception => e
-        # binding.pry
+      end
+      
+      if Rails::VERSION::MINOR >= 2
+        def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
+          handle_storytime_urls(options)
+          url_for_without_storytime(options, route_name, url_strategy)
+        end
+      else
+        def url_for_with_storytime(options = {})
+          handle_storytime_urls(options)
+          url_for_without_storytime(options)
+        end
       end
 
       alias_method_chain :url_for, :storytime
+
     end
   end
-end
-
+end

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/dummy/log/development.log

@@ -119506,3 +119506,161 @@ Started GET "/assets/storytime/utilities.js?body=1" for 127.0.0.1 at 2014-10-21
   Storytime::Snippet Load (0.2ms)  SELECT  "storytime_snippets".* FROM "storytime_snippets"   ORDER BY "storytime_snippets"."id" DESC LIMIT 1
   Storytime::Snippet Load (0.1ms)  SELECT  "storytime_snippets".* FROM "storytime_snippets"  WHERE "storytime_snippets"."name" = 'asdf2' LIMIT 1
   Storytime::Snippet Load (0.2ms)  SELECT  "storytime_snippets".* FROM "storytime_snippets"  WHERE "storytime_snippets"."name" = 'asdf2' LIMIT 1
+   (1.1ms)  CREATE TABLE "friendly_id_slugs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "slug" varchar(255) NOT NULL, "sluggable_id" integer NOT NULL, "sluggable_type" varchar(50), "scope" varchar(255), "created_at" datetime) 
+   (0.1ms)  select sqlite_version(*)
+   (0.9ms)  CREATE UNIQUE INDEX "index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope" ON "friendly_id_slugs" ("slug", "sluggable_type", "scope")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+
+   (0.9ms)  CREATE  INDEX "index_friendly_id_slugs_on_slug_and_sluggable_type" ON "friendly_id_slugs" ("slug", "sluggable_type")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+
+   (0.9ms)  CREATE  INDEX "index_friendly_id_slugs_on_sluggable_id" ON "friendly_id_slugs" ("sluggable_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_sluggable_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_sluggable_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope' AND type='index'
+
+   (0.9ms)  CREATE  INDEX "index_friendly_id_slugs_on_sluggable_type" ON "friendly_id_slugs" ("sluggable_type")
+   (0.9ms)  CREATE TABLE "storytime_actions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "guid" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE TABLE "storytime_autosaves" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "content" text, "autosavable_id" integer, "autosavable_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.9ms)  CREATE  INDEX "autosavable_index" ON "storytime_autosaves" ("autosavable_type", "autosavable_id")
+   (0.9ms)  CREATE TABLE "storytime_comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "content" text, "user_id" integer, "post_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.9ms)  CREATE  INDEX "index_storytime_comments_on_post_id" ON "storytime_comments" ("post_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_storytime_comments_on_post_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_storytime_comments_on_post_id' AND type='index'
+
+   (0.9ms)  CREATE  INDEX "index_storytime_comments_on_user_id" ON "storytime_comments" ("user_id")
+   (0.8ms)  CREATE TABLE "storytime_media" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "file" varchar(255), "user_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE  INDEX "index_storytime_media_on_user_id" ON "storytime_media" ("user_id")
+   (0.9ms)  CREATE TABLE "storytime_permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "role_id" integer, "action_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.0ms)  CREATE  INDEX "index_storytime_permissions_on_action_id" ON "storytime_permissions" ("action_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_storytime_permissions_on_action_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_storytime_permissions_on_action_id' AND type='index'
+
+   (0.9ms)  CREATE  INDEX "index_storytime_permissions_on_role_id" ON "storytime_permissions" ("role_id")
+   (1.0ms)  CREATE TABLE "storytime_posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "type" varchar(255), "title" varchar(255), "slug" varchar(255), "content" text, "excerpt" text, "published_at" datetime, "featured_media_id" integer, "featured" boolean DEFAULT 'f', "created_at" datetime, "updated_at" datetime, "secondary_media_id" integer) 
+   (1.0ms)  CREATE  INDEX "index_storytime_posts_on_user_id" ON "storytime_posts" ("user_id")
+   (0.9ms)  CREATE TABLE "storytime_roles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE TABLE "storytime_sites" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "post_slug_style" integer DEFAULT 0, "ga_tracking_id" varchar(255), "root_page_content" integer DEFAULT 0, "root_post_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE  INDEX "index_storytime_sites_on_root_post_id" ON "storytime_sites" ("root_post_id")
+   (1.0ms)  CREATE TABLE "storytime_snippets" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "content" text, "created_at" datetime, "updated_at" datetime) 
+   (1.0ms)  CREATE TABLE "storytime_taggings" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "tag_id" integer, "post_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.9ms)  CREATE  INDEX "index_storytime_taggings_on_post_id" ON "storytime_taggings" ("post_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_storytime_taggings_on_post_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_storytime_taggings_on_post_id' AND type='index'
+
+   (1.0ms)  CREATE  INDEX "index_storytime_taggings_on_tag_id" ON "storytime_taggings" ("tag_id")
+   (1.0ms)  CREATE TABLE "storytime_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE TABLE "storytime_versions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "content" text, "user_id" integer, "versionable_id" integer, "versionable_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE  INDEX "index_storytime_versions_on_user_id" ON "storytime_versions" ("user_id")
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_storytime_versions_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_storytime_versions_on_user_id' AND type='index'
+
+   (1.0ms)  CREATE  INDEX "versionable_index" ON "storytime_versions" ("versionable_type", "versionable_id")
+   (1.0ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime, "storytime_role_id" integer, "storytime_name" varchar(255)) 
+   (0.9ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (0.9ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.0ms)  CREATE  INDEX "index_users_on_storytime_role_id" ON "users" ("storytime_role_id")
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141021073356')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140530185250')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140501174341')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140509191309')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140511200849')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140513161233')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140514200234')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140514200304')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140516141252')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140521190606')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140521191048')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140521191728')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140521191744')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140813014447')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140813130534')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20140916183056')
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141020213343')