tomify 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a150d58dedb05af95126801e20124eb12a0d560
-  data.tar.gz: b52597cf7561633de5a271dd217ddea463787a40
+  metadata.gz: 85ed285b35f88cccdcd9e97d65c548def5a31246
+  data.tar.gz: 8b6da7d56dbf1e62ffc0cdca368bb76ec8bb7fcf
 SHA512:
-  metadata.gz: b5163f01fddc2fd9cbb95ee29a1482d757feb9f24a83faa87dc0bb1f90b8d23aa85b53ae107d14ad06e81e939e68a9592fe763ac743cff180e821fe691e19ba9
-  data.tar.gz: b3b4bc88c6243f44348b1c5623394c9149da46f0ec2f734665d2df3eb161d88101bda6d95b616945fbd6f8b0f25b1f791640a049130213aa3e498d1ec3d80274
+  metadata.gz: b2b4b0a746afbf86c9c6a33387dd10f6c069667c40c7d882985601f3ff0417ae5632ab23d116cecddcfe0e686dff8f3582f5858fab1a9d83f12f33ebcc3a508f
+  data.tar.gz: 120be037ee276b3a4903798c5a0f613c2a38d5501e68499b8b1e3a4263eb87596209d988503c4c04c9ca9651588dedc722ddce7310817f0745587f5abe2f425a

data/app/assets/javascripts/tomify/default/object.coffee

@@ -10,3 +10,6 @@
     path += "#{encodeURIComponent(key)}=#{encodeURIComponent(value)}"
     path += "&" unless key == last
   path
+
+@ObjectEmpty = (object) ->
+  Object.keys(object).length == 0

data/app/assets/javascripts/tomify/dynamic/classes/component.coffee

@@ -3,5 +3,7 @@ class @Component extends Namespace
   @create: (namespace, component) ->
     component.displayName ?= namespace
     component.mixins = @defaultMixins.concat(component.mixins || [])
-    @namespace namespace, React.createClass(component)
+    value = @namespace namespace, React.createClass(component)
+    @public namespace
+    value
   @defaultMixins: [WillInitializeMixin, FollowMixin]

data/app/assets/javascripts/tomify/dynamic/classes/field.coffee

@@ -1,6 +1,7 @@
 class @Field
   @build: (options) ->
     props = { name: options.name, type: options.type }
+    props.placeholder = options.placeholder || options.name.titleize
     switch props.type
       when "checkbox"
         props.label = options.label

data/app/assets/javascripts/tomify/dynamic/classes/form.coffee

@@ -1,6 +1,6 @@
 class @Form
   copy: ->
-    form = new Form(@layout)
+    form = new Form @layout
     form.fields = (field.copy(form) for field in @fields)
     form.models = @models
     form
@@ -28,10 +28,11 @@ class @Form
     options = $.extend { type: type, name: name, form: @ }, options
     @fields.push Field.build(options)
     @models.push options.model if options.model
-  setComponent: (component) ->
+  setComponent: (component, store) ->
+    store ?= component.store
     @component = component
-    @record = component.store.findOrCreate "Record", {}
-    @changes = component.store.findOrCreate "Changes", {}
+    @record = store.findOrCreate "Record", {}
+    @changes = store.findOrCreate "Changes", {}
     @stores = { record: @record, changes: @changes }
     component.followModels.push model for model in @models
     component.followStores.push BuildObject(key, value) for key, value of @stores
@@ -57,10 +58,10 @@ class @Form
     FieldComponent = Form.Field[field.props.type.capitalize] || Form.Field.Default
     if @layout == "horizontal"
       <div key={field.props.name} className="form-group">
-        <label className="col-sm-2 control-label" htmlFor={field.props.name}>
+        <label className="col-sm-3 control-label" htmlFor={field.props.name}>
           {field.props.name.titleize}
         </label>
-        <div className="col-sm-10">
+        <div className="col-sm-9">
           <FieldComponent {...field.props} />
         </div>
       </div>

data/app/assets/javascripts/tomify/dynamic/classes/namespace.coffee

@@ -1,24 +1,20 @@
 class @Namespace
   @base: window,
   @namespace: (namespace, value) ->
-    unless namespace?.length then throw "Namespace: Requires Keys"
-    unless value? then throw "Namespace: Requires Value"
-    keys = namespace.split(".")
     value.namespace = namespace
+    @base[namespace] = value
+  @public: (namespace) ->
+    keys = namespace.split(".")
     scope = @base
     for key in keys when key isnt keys.last
       scope[key] ?= {}
       scope = scope[key]
-    scope[keys.last] = value
-    value
+    scope[keys.last] = @find namespace
   @create: @namespace
   @find: (namespace) ->
-    unless namespace?.length then throw "Namespace: Requires Keys"
-    scope = @base
-    scope = (scope ? {})[key] for key in namespace.split(".")
-    scope
+    @base[namespace]
   @findOrCreate: (namespace, options) ->
-    @find(namespace, options) || @create(namespace, options)
+    @find(namespace) ? @create(namespace, options)
   findOrCreate: (namespace, options) ->
     namespace = "#{@namespace}.#{namespace}"
-    @constructor.find(namespace, options) || @constructor.create(namespace, options)
+    @constructor.find(namespace) ? @constructor.create(namespace, options)

data/app/assets/javascripts/tomify/dynamic/classes/store.coffee

@@ -24,7 +24,7 @@ class @Store extends Observer
     @set(item for item in data when item?)
   get: (field) ->
     throw "Store: Invalid Data Type" unless @isDefined()
-    return @data if @isString() && !field
+    return @data if @isBoolean() || @isString()
     data = $.extend(@data.constructor(), @data)
     if field then data[field] else data
   empty: ->
@@ -34,4 +34,5 @@ class @Store extends Observer
   isDefined: -> @data?
   isObject: -> @data instanceof Object
   isArray: -> @data instanceof Array
+  isBoolean: -> $.type(@data) == "boolean"
   isString: -> $.type(@data) == "string"

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

@@ -16,6 +16,7 @@ env.on "change", ->
 
 $ -> Store.find("Env").set(window.env)
 
+@redirect = (path) -> location.assign path || "/"
 @message = (message) -> Store.find("Messages").push message
 @setting = (name) ->
   setting = Store.find("Settings").get().find (setting) -> setting.name == name

data/app/assets/javascripts/tomify/dynamic/react/components/fields/default.coffee

@@ -1,3 +1,3 @@
 Component.create "Form.Field.Default",
   render: ->
-    <input placeholder={@props.name.titleize} className="form-control" type={@props.type} name={@props.name} id={@props.name} value={@props.value(@props.name)} onChange={@props.onChange.bind(null, @props.name)} />
+    <input placeholder={@props.placeholder} className="form-control" type={@props.type} name={@props.name} id={@props.name} value={@props.value(@props.name)} onChange={@props.onChange.bind(null, @props.name)} />

data/app/assets/javascripts/tomify/dynamic/react/components/fields/file.coffee

@@ -1,3 +1,3 @@
 Component.create "Form.Field.File",
   render: ->
-    <input placeholder={@props.name.titleize} className="form-control" type="file" name={@props.name} id={@props.name} onChange={@props.onChange.bind(null, @props.name)} />
+    <input placeholder={@props.placeholder} className="form-control" type="file" name={@props.name} id={@props.name} onChange={@props.onChange.bind(null, @props.name)} />

data/app/assets/javascripts/tomify/dynamic/react/components/fields/textarea.coffee

@@ -1,3 +1,3 @@
 Component.create "Form.Field.Textarea",
   render: ->
-    <textarea placeholder={@props.name.titleize} className="form-control" type="text" name={@props.name} id={@props.name} value={@props.value(@props.name)} onChange={@props.onChange.bind(null, @props.name)} />
+    <textarea placeholder={@props.placeholder} className="form-control" type="text" name={@props.name} id={@props.name} value={@props.value(@props.name)} onChange={@props.onChange.bind(null, @props.name)} />

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

@@ -11,7 +11,7 @@ Component.create "Layout.Messages",
     <div>
       {for message, i in @state.messages
         <div key={i} className="alert alert-#{message.type} text-center">
-          {message.text}
+          <span dangerouslySetInnerHTML={__html: message.text} />
           <a className="btn btn-danger btn-xs pull-right" href="#" onClick={@remove.bind(null, i)}><i className="fa fa-close" /></a>
         </div>
       }

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

@@ -7,7 +7,8 @@ Component.create "Layout.PublicNavbar",
   logout: (e) ->
     e.preventDefault()
     Model.find("Public.Session").destroy().then (response) ->
-      window.location.replace "/" if response.type == "success"
+      return redirect response.redirect if response.type == "success"
+      message type: response.type, text: response.message
   link: (page) ->
     <li key={page.name}>
       <a href="/#{page.path}">{page.name}</a>
@@ -27,7 +28,7 @@ Component.create "Layout.PublicNavbar",
         <div id="navbar" className="navbar-collapse collapse">
           <ul className="nav navbar-nav">
             {if @state.user.id
-              @link(name: "Profile", path: "user/edit")
+              @link(name: "Profile", path: "profile")
             else if setting "allow_signup"
               @link(name: "Login", path: "session")
             }

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

@@ -0,0 +1,26 @@
+Component.create "Public.Profile",
+  followStores: ["user"]
+  componentWillInitialize: ->
+    @model = Model.find "Public.User"
+    @model.setAction "show", Request.none
+    @follow @model.on "show", @modelShow
+    @follow @model.on "edit", @modelEdit
+  modelShow: ->
+    @setState(edit: false)
+  modelEdit: ->
+    @setState(edit: true)
+  edit: (e) ->
+    e.preventDefault()
+    Model.findOrCreate("Public.User").edit()
+  render: ->
+    <div className="container-fluid">
+      <div className="row text-center">
+        <div className="col-md-4 col-md-offset-4">
+          {if @state.edit
+            <Public.Users.Edit />
+          else
+            <Public.Users.Show />
+          }
+        </div>
+      </div>
+    </div>

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

@@ -1,6 +1,4 @@
 Component.create "Public.Sessions.Show",
-  getInitialState: ->
-    { forgotPassword: false }
   componentWillInitialize: ->
     @follow Model.find("Public.Session").on "new", @newSession
     @follow Model.find("Public.Password").on "new", @newPassword

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

@@ -26,17 +26,30 @@ Component.create "Public.Users.Edit",
     else
       @model.update @form.changes.get()
     false
+  show: (e) ->
+    e.preventDefault()
+    Model.findOrCreate("Public.User").show()
+  destroy: (e) ->
+    e.preventDefault()
+    Model.find("Public.User").destroy().then (response) ->
+      return redirect response.redirect if response.type == "success"
+      message type: response.type, text: response.message
+    false
   render: ->
-    <div className="container-fluid">
-      <div className="row text-center">
-        <div className="col-md-4 col-md-offset-4">
-          <h3>Edit Profile</h3>
-          <form onSubmit={@submit}>
-            {@form.render()}
-            <div className="form-group">
-              <input type="submit" name="commit" value="Save" className="btn btn-primary" />
-            </div>
-          </form>
+    <div>
+      <h3>Edit Profile</h3>
+      <form onSubmit={@submit}>
+        {@form.render()}
+        <div className="form-group">
+          <div className="btn-group">
+            <input type="submit" name="commit" value="Save" className="btn btn-primary" />
+            <a href="#" onClick={@show} className="btn btn-default">Back</a>
+          </div>
+        </div>
+        <div className="form-group">
+          <small>
+            <a href="#" onClick={@destroy} data-confirm="Are you sure you want to permanently delete your account?">Delete</a>
+          </small>
         </div>
-      </div>
+      </form>
     </div>

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

@@ -14,7 +14,7 @@ Component.create "Public.Users.New",
     @form = form.setComponent @
     @follow @model.on "create", @modelCreate
   modelCreate: (response) ->
-    return window.location.replace "/" if response.type == "success"
+    return redirect response.redirect if response.type == "success"
     message type: response.type, text: response.message
   submit: (e) ->
     e.preventDefault()

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

@@ -0,0 +1,23 @@
+Component.create "Public.Users.Show",
+  followStores: ["user"]
+  edit: (e) ->
+    e.preventDefault()
+    Model.findOrCreate("Public.User").edit()
+  render: ->
+    <div>
+      <h3>Profile</h3>
+      <div className="row">
+        <div className="col-sm-6 text-right"><b>First Name:</b></div>
+        <div className="col-sm-6 text-left">{@state.user.first_name}</div>
+      </div>
+      <div className="row">
+        <div className="col-sm-6 text-right"><b>Last Name:</b></div>
+        <div className="col-sm-6 text-left">{@state.user.last_name}</div>
+      </div>
+      <div className="row">
+        <div className="col-sm-6 text-right"><b>Member Since:</b></div>
+        <div className="col-sm-6 text-left">{@state.user.created_at.date()}</div>
+      </div>
+      <br />
+      <a href="#" onClick={@edit} className="btn btn-primary">Edit</a>
+    </div>

data/app/assets/javascripts/tomify/dynamic/react/mixins/follow.coffee

@@ -19,7 +19,7 @@
           state[key] = store.get()
           context.setState(state)
         context.events.push store.on("change", callback)
-    model.all() for key, model in @models when !model.requested("all")
+    model.all() for key, model of @models when !model.requested("all")
   componentWillUnmount: ->
     event.off() for event in @events
   follow: (event) ->
@@ -33,6 +33,7 @@
   setupModels: ->
     @models = @convertToHash(@followModels?() || @followModels || [])
     for key, value of @models when not (value instanceof Store)
+      delete @models[key]
       store = @stores[key.camelize] = @store.findOrCreate value, []
       model = @models[key.camelize] = Model.findOrCreate(value)
       context = @

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

@@ -1,12 +1,11 @@
 class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
   before_action :require_user!, only: [:show, :update]
-  before_action :set_record, only: [:show, :update]
+  before_action :set_record, only: [:show, :update, :destroy]
   before_action :not_found, only: :create, unless: "setting(:allow_signup)"
 
   def create
     session[:current_user_id] = Tomify.models.user.create!(record_params).id
-    flash[:success] = "Welcome #{current_user.name}!"
-    render json: { type: :success, message: "Welcome #{current_user.name}!" }
+    render json: { type: :success }, success: "Welcome #{current_user.name}!"
   rescue ActiveRecord::RecordInvalid => e
     render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
   end
@@ -18,6 +17,13 @@ class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
     render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
   end
 
+  def destroy
+    flash[:danger] = "Goodbye #{current_user.name}"
+    find_record
+    destroy_record
+    render json: { type: :success }
+  end
+
   private
   def set_record
     @record = current_user

data/app/controllers/tomify/public/profiles_controller.rb

@@ -0,0 +1,7 @@
+class Tomify::Public::ProfilesController < Tomify.controllers.public
+  before_action :require_user!
+
+  def show
+    render component: "Public.Profile"
+  end
+end

data/config/routes.rb

@@ -3,7 +3,7 @@ Rails.application.routes.draw do
     root "public/pages#root"
 
     scope module: :public do
-      resource :user, only: :edit
+      resource :profile, only: :show
       resource :session, only: :show
     end
 
@@ -27,7 +27,7 @@ Rails.application.routes.draw do
       end
 
       namespace :public do
-        resource :user, only: [:create, :show, :update]
+        resource :user, only: [:create, :show, :update, :destroy]
         resource :session, only: [:create, :destroy]
         resource :password, only: :create
       end

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,10 +288,12 @@ files:
 - app/assets/javascripts/tomify/dynamic/react/components/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/pagination.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/passwords/new.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/public/profile.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/sessions/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/sessions/show.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/users/edit.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/users/new.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/public/users/show.coffee
 - app/assets/javascripts/tomify/dynamic/react/mixins/follow.coffee
 - app/assets/javascripts/tomify/dynamic/react/mixins/will-initialize.coffee
 - app/assets/javascripts/tomify/dynamic/react/mount.coffee
@@ -331,8 +333,8 @@ files:
 - app/controllers/tomify/concerns/default/react_helper.rb
 - app/controllers/tomify/public/controller.rb
 - app/controllers/tomify/public/pages_controller.rb
+- app/controllers/tomify/public/profiles_controller.rb
 - app/controllers/tomify/public/sessions_controller.rb
-- app/controllers/tomify/public/users_controller.rb
 - app/controllers/tomify_controller.rb
 - app/helpers/tomify/carrierwave_helper.rb
 - app/helpers/tomify/email_helper.rb

data/app/controllers/tomify/public/users_controller.rb

@@ -1,7 +0,0 @@
-class Tomify::Public::UsersController < Tomify.controllers.public
-  before_action :require_user!
-
-  def edit
-    render component: "Public.Users.Edit"
-  end
-end