tomify 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad48b3ce738012cd5586f14612a7c57517bde4d
-  data.tar.gz: 1fc96ad471a7221bfdebc6940b09dad8f628d5c1
+  metadata.gz: 34bf7184118f201d83d1ef89b98057bb1d41f53e
+  data.tar.gz: ac949b2ec8b51179601e9ee09ae94902d41c590d
 SHA512:
-  metadata.gz: 71950755f898ab68dc1eb8254c872ebf9ca23241b50dfce9e236bac9985802142dc0db297cb0e70e752613f73e1356a2917527a379c9ff0387cb731268c6fdbe
-  data.tar.gz: cc9a1edaefeaf2fb3091de2269d2de8d146e6a84ef212898e2663af1a834316db39c0e8caeeeb0b79bd9bf17bf003b9fa6ed6b884bc69b23320388379a904735
+  metadata.gz: 3638b5741f85d2218f22ffcf61b52d4a211c2140e9e0623d3c104af6fcb780b4a4b8f0161678d227b3745bffece49b36c4a9eaf47efb0a9cd48f09fffdc212ea
+  data.tar.gz: c2c8fb0eb2a8dfc5046aa1f74fefa24bf3b2ecfc52027fb9083656c4257fb8f709dfdc1367fe2822f5ce964ed268d0701e117d0d857713fce7ef01fdb9ce5d44

data/app/assets/javascripts/tomify/dynamic/global.coffee

@@ -25,7 +25,9 @@ $ ->
   Store.find("Params").set params
   Store.find("Env").set window.env
 
-@message = (message) -> Store.find("Messages").push message
+@message = (message) =>
+  message.id ?= @uuid()
+  Store.find("Messages").push message
 @redirect = (path) -> location.assign path || "/"
 @setting = (name) ->
   setting = Store.find("Settings").get().find (setting) -> setting.name == name
@@ -35,3 +37,4 @@ $ ->
   page ?= { path: path ? template }
   if page.root then "/" else "/#{page.path}"
 @addPlugin = (plugin) -> Store.find("Plugins").push plugin
+@uuid = -> Math.random().toString(36).substr(2, 9)

data/app/assets/javascripts/tomify/dynamic/react/components/layout/messages.coffee

@@ -2,9 +2,12 @@ Component.create "Layout.Messages",
   followStores: ["messages"]
   componentWillInitialize: ->
     @store = Store.create "Messages", window.env.messages
-    @follow @store.on "push", -> $("body").scrollTop(0)
+    @follow @store.on "push", (message) =>
+      $("body").scrollTop(0)
+      setTimeout @remove.bind(null, message), 5000
   remove: (i, e) ->
-    e.preventDefault()
+    e && e.preventDefault()
+    i = @store.get().map((m) -> m.id).indexOf(i.id) if i?.id
     @store.remove(i)
     false
   render: ->

data/app/assets/javascripts/tomify/dynamic/react/components/layout/public_navbar.coffee

@@ -31,7 +31,7 @@ Component.create "Layout.PublicNavbar",
               if @state.user.id
                 @link(name: "Profile", url: "/profile")
               else
-                @link(name: "Login", url: "/session")
+                @link(name: setting("login_text") || "Login", url: "/session")
             }
             {for page in @state.pages
               if page.children[0]

data/app/assets/javascripts/tomify/dynamic/react/components/public/subscription.coffee

@@ -1,29 +1,38 @@
-Model.create "Public.Subscription", path: "subscription"
-
 Component.create "Public.Subscription",
-  getInitialState: -> { email: Store.find("Params").get("email") }
+  getInitialState: -> { subscription: { active: true, email: Store.find("Params").get("email") }}
   componentWillInitialize: ->
-    @model = Model.find "Public.Subscription"
+    @model = Model.findOrCreate "Public.Subscription"
     @store = Store.findOrCreate "Public.Subscription"
-    @follow @model.on "destroy", @modelDestroy
-  modelDestroy: (response) ->
-    message type: response.type, text: response.message unless response.type == "success"
-    @setState unsubscribed: true, message: response.message
+    @follow @model.on "edit", @modelUpdate
+    @follow @model.on "create", @modelUpdate
+    @follow @model.on "destroy", @modelUpdate
+    @model.edit(Store.find("Params").get "email")
+  modelUpdate: (response) ->
+    message type: response.type, text: response.message if response.message
+    @setState subscription: response.data if response.data
+  create: (e) ->
+    e.preventDefault()
+    @model.create email: @state.subscription.email
   destroy: (e) ->
     e.preventDefault()
-    @model.destroy subscription: { email: @state.email }
+    @model.destroy email: @state.subscription.email
   render: ->
     <div className="row text-center">
       <div className="dynamic-sm">
-        <h3>Unsubscribe</h3>
-        {if @state.unsubscribed
-          <p>{@state.message}</p>
+        <h3>Subscription</h3>
+        {if @state.subscription.active
+          <div>
+            <p>
+              <strong>{@state.subscription.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
+            </p>
+            <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Unsubscribe</a>
+          </div>
         else
           <div>
             <p>
-              By clicking Submit, <strong>{@state.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
+              <strong>{@state.subscription.email}</strong> will be subscribed to the emails from {setting "name"}.
             </p>
-            <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Submit</a>
+            <a href="#" onClick={@create} className="btn btn-primary">Subscribe</a>
           </div>
         }
       </div>

data/app/assets/javascripts/tomify/dynamic/react/components/public/users/edit.coffee

@@ -48,7 +48,9 @@ Component.create "Public.Users.Edit",
         </div>
         <div className="form-group">
           <small>
-            <a href="#" onClick={@destroy} data-confirm="Are you sure you want to permanently delete your account?">Delete</a>
+            <a href="#{path 'subscription'}?email=#{@form.record.get 'email'}">Email Subscription</a>
+            <span> | </span>
+            <a href="#" onClick={@destroy} data-confirm="Are you sure you want to permanently delete your account?">Delete Account</a>
           </small>
         </div>
       </form>

data/app/controllers/tomify/api/public/subscriptions_controller.rb

@@ -1,11 +1,24 @@
 class Tomify::Api::Public::SubscriptionsController < Tomify.controllers.public_api
+  def create
+    record.activities.create(action: action_name, controller: controller_name)
+    if record.update(active: true)
+      render json: { type: :success, data: data, message: "You have been subscribed to #{setting(:name)}" }
+    else
+      render json: { type: :warning, message: "There was a problem subscribing you to #{setting(:name)}" }
+    end
+  end
+
   def destroy
-    subscription = Tomify.models.subscription.find_or_create_by(email: params[:subscription][:email])
-    subscription.activities.create(action: action_name, controller: controller_name)
-    if subscription.update(active: false)
-      render json: { type: :success, message: "You have been unsubscribed from #{setting(:name)}" }
+    record.activities.create(action: action_name, controller: controller_name)
+    if record.update(active: false)
+      render json: { type: :success, data: data, message: "You have been unsubscribed from #{setting(:name)}" }
     else
       render json: { type: :warning, message: "There was a problem unsubscribing you from #{setting(:name)}" }
     end
   end
+
+  private
+  def find_record
+    @record ||= Tomify.models.subscription.find_or_create_by(email: params[:email] || params[:subscription][:email])
+  end
 end

data/app/controllers/tomify/concerns/api/helpers.rb

@@ -41,11 +41,11 @@ module Tomify::Concerns::Api::Helpers
   end
 
   def record
-    @record
+    @record ||= find_record
   end
 
   def records
-    @records
+    @records ||= find_records
   end
 
   def record_params

data/app/controllers/tomify/concerns/api/json.rb

@@ -33,19 +33,17 @@ module Tomify::Concerns::Api::JSON
   end
 
   def update
-    find_record
     update_record
     render json: { type: :success, data: data, message: "#{model_name} Updated" }
   end
 
   def destroy
-    find_record
     destroy_record
     render json: { type: :danger, message: "#{model_name} Deleted" }
   end
 
   private
   def data
-    @data ||= (record || records).as_json(serializable_options)
+    @data ||= (@record || @records).as_json(serializable_options)
   end
 end

data/app/controllers/tomify/concerns/default/navbar_helper.rb

@@ -50,7 +50,7 @@ module Tomify::Concerns::Default::NavbarHelper
   def navbar_pages_from(item)
     case item
     when Proc
-      navbar_pages_from item.call
+      navbar_pages_from item.call(self)
     when Hash
       navbar_pages_from_hash item
     when Array

data/config/routes.rb

@@ -34,7 +34,8 @@ Rails.application.routes.draw do
         resource :user, only: [:create, :show, :update, :destroy]
         resource :session, only: [:create, :destroy]
         resource :password, only: :create
-        resource :subscription, only: :destroy
+        resource :subscriptions, only: [:create, :destroy]
+        resources :subscriptions, only: :show, param: :email, constraints: { email: /[^\/]+/ }
       end
     end
 

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails