chr 0.3.5 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f826f08992b4b9540353bcbbba91f9065e0de72
-  data.tar.gz: a63be1339e56a9672be6dd74e1e4a8c527827bde
+  metadata.gz: 169823bd19263619ab77cad99e39dc2ce2be85cd
+  data.tar.gz: 59297731059ca511038bfd95152519dd80d42750
 SHA512:
-  metadata.gz: b3213804478267d46391d85bacfa7adb5070a67667b0c1310004480f44a9793903f9634f0b61c8ac7e603fc400b32359d7aa4ee269ac72a1ccd026501b7b3344
-  data.tar.gz: 5308776a2b5f5b5b76385a14ca232786b8555cff71419ee3f7d267b35089bc857591f04647c061aee2e4d362f82bac665ece115f4726bb9fd90dcfefa180448c
+  metadata.gz: be0677f767643cac2529520c2b12b90e78e17dda59ceb4148b51fb900598603695de1ed090df233d31aafce1a5e6d32f30eaf4c0964ea160d3a08a26e851af42
+  data.tar.gz: b240a37078f759f47aae0f26dc802aee807f4d1c988571c43622000519f8deea817138b5b5509261dd9854ddff500b9a5e7e43d1e1ded9d2983b0fe0d39e4921

data/.coveralls.yml

@@ -0,0 +1,2 @@
+# service_name: travis-ci
+# repo_token: 

data/.gitignore

@@ -5,4 +5,9 @@ _site
 *swp
 Gemfile.lock
 tmp
-node_modules
+test/rails_app/tmp
+test/rails_app/log
+test/rails_app/public/uploads
+log
+coverage
+uploads

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/.travis.yml

@@ -0,0 +1,18 @@
+# Travis CI will consult .ruby-version in the root of the repository and use the
+# indicated Ruby runtime
+language: ruby
+rvm:
+- 2.2.2
+
+# Make Travis CI to start the MongoDB service on boot
+services:
+  - mongodb
+
+notifications:
+  email: false
+
+before_install:
+  - sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi'
+
+script: 
+  - xvfb-run rake test

data/README.md

@@ -1,5 +1,8 @@
 # Character
 
+[![Build Status](https://travis-ci.org/slate-studio/chr.svg?branch=master)](https://travis-ci.org/slate-studio/chr)
+
+
 *Powerful responsive javascript CMS for apps.*
 
 
@@ -41,6 +44,7 @@ Styles setup:
 
 * [Rails Setup](docs/rails.md)
 * [Bootstrap Data](docs/bootstrap.md)
+* [Tests](docs/tests.md)
 
 More documentation and samples comming soon...
 

data/Rakefile

@@ -1,3 +1,18 @@
 # encoding: utf-8
-require "rubygems"
-require "bundler"
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run tests for all ORMs.'
+task default: :test
+
+desc 'Run Character unit tests.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+  t.warning = false
+end

data/app/assets/javascripts/chr.coffee

@@ -1,28 +1,15 @@
-#= require ./chr/core/utils
-#= require ./chr/core/chr
+#= require ./chr/utils
+#= require ./chr/chr
+#= require ./chr/module
+#= require ./chr/list
+#= require ./chr/item
+#= require ./chr/view
 
-#= require ./chr/core/module
-#= require ./chr/core/list
-#= require ./chr/core/item
-#= require ./chr/core/view
+#= require ./stores/object
+#= require ./stores/array
+#= require ./stores/rest-object
+#= require ./stores/rest-array
+#= require ./stores/rails-object
+#= require ./stores/rails-array
 
-#= require ./chr/store/object-store
-#= require ./chr/store/array-store
-#= require ./chr/store/rest-object-store
-#= require ./chr/store/rest-array-store
-#= require ./chr/store/rails-object-store
-#= require ./chr/store/rails-array-store
-
-#= require ./form/form
-#= require ./form/input-form
-#= require ./form/input-hidden
-#= require ./form/input-string
-#= require ./form/input-text
-#= require ./form/input-checkbox
-#= require ./form/input-password
-#= require ./form/input-color
-#= require ./form/input-file
-#= require ./form/input-list
-#= require ./form/input-select
-#= require ./form/input-select2
-#= require ./form/expandable-group
+#= require formagic

data/app/assets/javascripts/chr/{core/chr.coffee → chr.coffee}

@@ -86,7 +86,7 @@ class @Chr
     window.location.hash = path
 
 
-  start: (@config) ->
+  start: (title, @config) ->
     @$el       =$ (@config.selector ? 'body')
     @$navBar   =$ "<nav class='sidebar'>"
     @$mainMenu =$ "<div class='menu'>"
@@ -109,6 +109,9 @@ class @Chr
   showError: (message) ->
     alert 'Error: ' + message
 
+  showNotification: (message) ->
+    alert message
+
 
 include(Chr, chrRouter)
 

data/app/assets/javascripts/chr/{core/item.coffee → item.coffee}

@@ -84,7 +84,8 @@ class @Item
         @$el.addClass('reorderable')
         @$el.append $("<div class='icon-reorder'></div>")
 
-    @config.onItemRender?(this)
+    if @type == 'object'
+      @config.onItemRender?(this)
 
 
   destroy: ->

data/app/assets/javascripts/chr/{core/list.coffee → list.coffee}

@@ -98,7 +98,7 @@ class @List
     if hash.startsWith "#/#{ @module.name }"
       for a in @$items.children()
         itemPath = $(a).attr('href')
-        if hash.startsWith(itemPath)
+        if itemPath && hash.startsWith(itemPath)
           return $(a).addClass('active')
 
 

data/app/assets/javascripts/chr/{core/list_pagination.coffee → list_pagination.coffee}

@@ -52,6 +52,18 @@ chr._bind_mobile_scroll = ->
     @_mobile_scroll_binded = true
 
 
+chr._list_height = ($items) ->
+  height = 0
+  offset = null
+
+  $items.children().each ->
+    if offset != $(this).position().top
+      offset  = $(this).position().top
+      height += $(this).height()
+
+  return height
+
+
 chr._load_next_page = ($viewport, list, scroll_top) ->
   $items = list.$items
   store  = list.config.arrayStore
@@ -61,11 +73,10 @@ chr._load_next_page = ($viewport, list, scroll_top) ->
   if store.lastPageLoaded then return
 
   # check if scroll is near bottom of the $viewport
-  viewport_height   = $viewport.height()
-  list_items_height = 0
-  $items.children().each -> list_items_height += $(this).height()
+  viewport_height = $viewport.height()
+  list_height     = chr._list_height($items)
 
-  if list_items_height - scroll_top - 100 > viewport_height
+  if list_height - scroll_top - 100 > viewport_height
     return
 
   list.showSpinner()

data/app/assets/javascripts/chr/{core/list_search.coffee → list_search.coffee}

@@ -9,7 +9,7 @@
   _bind_search: ->
     @$search       =$ "<div class='search'></div>"
     @$searchIcon   =$ "<a href='#' class='icon'></a>"
-    @$searchInput  =$ "<input type='text' placeholder='Search...' />"
+    @$searchInput  =$ "<input type='text' placeholder='Search' />"
     @$searchCancel =$ "<a href='#' class='cancel'>Cancel</a>"
 
     @$header.append(@$search)

data/app/assets/javascripts/chr/{core/view.coffee → view.coffee}

@@ -11,12 +11,15 @@
 # -----------------------------------------------------------------------------
 #
 # Config options:
-#   formClass        - custom form class to be used
-#   formSchema       - form schema for object, autogenerated if missing
-#   disableDelete    - do not add delete button below the form
-#   disableSave      - do not add save button in header
-#   fullsizeView     — use fullsize layout in desktop mode
-#   onViewShow       - on show callback
+#   formClass         - custom form class to be used
+#   formSchema        - form schema for object, autogenerated if missing
+#   disableDelete     - do not add delete button below the form
+#   disableSave       - do not add save button in header
+#   fullsizeView      — use fullsize layout in desktop mode
+#   onViewShow        - on show callback
+#   onSaveSuccess     - on document succesfully saved callback
+#   defaultNewObject  - used to generate new form
+#   disableFormCache  - do not cache form changes
 #
 # Public methods:
 #   show(objectId)
@@ -39,6 +42,10 @@ class @View
     if @config.fullsizeView
       @$el.addClass 'fullsize'
 
+    # disable local storage cache, as that has to be
+    # refactored to be more secure and obvious to user
+    @config.disableFormCache ||= true
+
     # header
     @$header  =$ "<header class='header'></header>"
     @$spinner =$ "<div class='spinner'></div>"
@@ -90,6 +97,8 @@ class @View
     @form.updateValues(@object)
     @_clear_local_storage_cache()
 
+    @config.onSaveSuccess?(@)
+
 
   _save_error: (message, validationErrors) ->
     @$el.removeClass('view-saving')
@@ -153,10 +162,12 @@ class @View
       @$header.append @$saveBtn
 
     # sync with local storage cache
-    @_update_object_from_local_storage()
+    if ! @config.disableFormCache
+      @_update_object_from_local_storage()
 
     # form
-    @form = new (@config.formClass ? Form)(@object, @config)
+    object = @object || @config.defaultNewObject || null
+    @form  = new (@config.formClass ? Form)(object, @config)
     @$content.append @form.$el
     @form.initializePlugins()
 
@@ -164,7 +175,8 @@ class @View
     @config.onViewShow?(@)
 
     # enable local storage caching
-    @_bind_form_change()
+    if ! @config.disableFormCache
+      @_bind_form_change()
 
 
   _show_error: ->

data/app/assets/javascripts/{chr/store → stores}/rails-form-object-parser.coffee

@@ -41,4 +41,7 @@
 
         formDataObject.append("#{ @config.resource }#{ attr_name }", attr_value)
 
-    return formDataObject
+    return formDataObject
+
+
+

data/app/assets/javascripts/{chr/store/rest-array-store.coffee → stores/rest-array.coffee}

@@ -220,12 +220,15 @@ class @RestArrayStore extends ArrayStore
 
       if @_is_pagination_edge_case() && d.positionHasChanged
         if d.position >= (@nextPage - 1) * @objectsPerPage - 1
+
+          console.log ':: reloading current page ::'
+          # @TODO: test this scenario
+
           # if object added to the end of the list reload page to
           # sync last item on the page
           @_reload_current_page(callbacks)
 
-      else
-        callbacks.onSuccess(data)
+      callbacks.onSuccess(data)
 
     ), callbacks.onError
 

data/app/assets/stylesheets/{_chr.scss → chr.scss}

@@ -1,3 +1,4 @@
+@import "normalize-rails";
 @import "bourbon";
 
 @import "chr/settings";
@@ -5,10 +6,4 @@
 @import "chr/icons";
 @import "chr/main";
 
-@import "form/input-select2";
-@import "form/expandable-group";
-@import "form/main";
-
-
-
-
+@import "formagic";

data/app/assets/stylesheets/chr/{_main.scss → main.scss}

@@ -5,7 +5,7 @@ html a { text-decoration: none; }
 
 
 /* Menu -------------------------------------------------------------------- */
-.menu { font-size: .8em; letter-spacing: 1px; text-transform: uppercase;  }
+.menu { font-size: .8em; }
 .menu:before { @include menu-title($contrastColor); content: 'CHARACTER'; }
 
 
@@ -16,10 +16,17 @@ html a { text-decoration: none; }
   .new           { @include position(absolute, 0 0   null null); @extend .icon-plus;                   }
   .new + .search { @include position(absolute, 0 40px inherit inherit);                                }
   .spinner       { @include spinner; @include hide; position: absolute; margin: 6px 0 0 -36px;         }
-  .save          { @include position(absolute, 0 1em null null); @include header-button($stableColor); font-weight: 500; }
+
+  // this is disabled until local storage is back
+  //.save          { @include position(absolute, 0 1em null null); @include header-button($stableColor); font-weight: 500; }
+  .save          { @include position(absolute, 0 1em null null); @include header-button($positiveColor); font-weight: 500; }
 }
 
-.view.has-unsaved-changes .save { color: $positiveColor; }
+// these are ignored until local storage is back
+.view.has-unsaved-changes .save  { color: $positiveColor; }
+.view.has-unsaved-changes .title:after { content: ' (not saved)'; font-weight: 300; font-size: .8em; }
+// ------------------------------------------------------
+
 .show-spinner .spinner { display: inline-block; }
 
 

data/app/assets/stylesheets/chr/{_mixins.scss → mixins.scss}

@@ -54,83 +54,6 @@
 }
 
 
-/* Switch ------------------------------------------------- */
-@mixin switch {
-  $switch-width: 52px;
-  $switch-padding: 2px;
-  $switch-height: 32px;
-  $switch-radius: $switch-height;
-  $knob-size: $switch-height - ($switch-padding * 2);
-  $knob-radius: $switch-height - ($switch-padding * 2);
-  $knob-width: $knob-size;
-  $switch-background: $white;
-  $switch-border-background: $contrastColor;
-  $switch-shadow: 0 0px 2px transparentize(black, 0.6);
-
-  border-radius: $switch-radius;
-  cursor: pointer;
-  display: inline-block;
-  height: $switch-height;
-  position: relative;
-  width: $switch-width;
-
-  input[type="checkbox"] {
-    display: none;
-
-    + .checkbox {
-      @include transition(all 0.3s ease);
-      background: $switch-border-background;
-      border-radius: $switch-radius;
-      border: none;
-      cursor: pointer;
-      height: $switch-height;
-      margin: 0;
-      padding: 0;
-      position: relative;
-      width: $switch-width;
-      z-index: 0;
-
-      &:before {
-        @include position(absolute, 2px 0 0 2px);
-        @include transform(scale(1));
-        @include transition(all 0.3s ease);
-        background: $switch-background;
-        border-radius: $switch-radius;
-        content: "";
-        height: $knob-radius;
-        width: $switch-width - ($switch-padding * 2);
-        z-index: 1;
-      }
-
-      &:after {
-        @include position(absolute, 2px 0 0 2px);
-        @include transition(all 0.3s ease);
-        @include size($knob-size);
-        background: $switch-background;
-        border-radius: $knob-radius;
-        box-shadow: $switch-shadow;
-        content: "";
-        z-index: 2;
-      }
-    }
-
-    &:checked {
-      + .checkbox {
-        background: $positiveColor;
-
-        &:before {
-          @include transform(scale(0));
-        }
-
-        &:after {
-          left: $switch-width - $knob-width - ($switch-padding);
-        }
-      }
-    }
-  }
-}
-
-
 /* Spinner ------------------------------------------------ */
 @mixin spinner {
   border:      .25em solid rgba($contrastColor, 0.2);