faalis 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d6f9b183ece15b72ef85fb3b1c41acb5b83dc3
-  data.tar.gz: b55b02c4d5ac355ab244fa64dddba6250631c730
+  metadata.gz: 43f7695840d9c906e726d44dc7e73ab16f288c67
+  data.tar.gz: 9bf0ceb04ac7ea42f538686101dd9aba081f6364
 SHA512:
-  metadata.gz: 2a0cb0d117abe8798a466bf7cbab923d0dcff029c66f6782935e62c11ffd31f02910671f989fb058efe1240fd66f4b56781ef68f1774117bd914495619b8b954
-  data.tar.gz: 489820dd820ecef13793baf510587918702649d1d40362aa842bf945119093bc89c6ccf8f70bdb534eeaa4b4f6536da25c66cffcf74827e8c83f4e15218c7a19
+  metadata.gz: 3ab3a88bbd4d6cf47859004bef759b84926402b97f74c5fc47bff8fdca298d455844a2666f0e5acffc73702982fea0e0010a0f074bb8e7a6c833a46a167e37cb
+  data.tar.gz: 1da96282c9542e22dcd07db980457d1c3c8009d617e2a332d1341a01aca7c3b0307d3603c329a4b4f2b47c9af4967494849c3528d5f75f63d2102151bd97bd49

data/app/assets/javascripts/faalis/{dashboard/angular.js → angular-manifest.js}

@@ -2,8 +2,10 @@
 //= require jquery
 //= require jquery_ujs
 //= require foundation
-//= require faalis/dashboard/lib/angular
-//= require faalis/dashboard/lib/angular-route
-//= require faalis/dashboard/lib/angular-animate
+//= require angular
+//= require angular-animate
+//= require angular-resource
+//= require angular-route
+//= require angular-sanitize
 //= require faalis/dashboard/lib/angular-gettext
 //= require faalis/dashboard/lib/lodash.underscore

data/app/assets/javascripts/faalis/dashboard/application.js.erb

@@ -10,6 +10,7 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require faalis/angular-manifest
 //= require_tree ./lib
 //= require faalis/dashboard/init
 //= require faalis/dashboard/app

data/app/assets/stylesheets/faalis/base.css.scss

@@ -7,11 +7,12 @@
 
 table{
    th{
-      text-align:center !important;
+      text-align: center !important;
+      margin: 0;
    }
-   width:90%;
-   margin-left:auto ;
-   margin-right:auto ;
+   width: 90%;
+   margin-left: auto;
+   margin-right: auto;
 }
 
 .warning{

data/app/assets/stylesheets/faalis/dashboard/dashboard.css.scss

@@ -16,78 +16,78 @@ body {
 }
 
 header {
-  background: white;
-  border-bottom: 1px solid $orange;
-  position: fixed;
-  z-index: 1000;
-  height: $header-height;
-  width: 100%;
-  ul {
-    list-style: none;
-
-    li {
-      display: inline;
-      h1 {
-        font-size: 1.5em;
-        display: inline-block;
-        font-weight: 300;
-        color: $darkgray;
-      }
-      .search {
-        display: inline-block;
-        padding: 0 10px;
-        input {
-          display: inline-block;
-          border-radius: 4px;
-          border-color: $lightergray;
-          box-shadow: none;
-          padding: 0 0.5em;
-        }
-      }
-    }
-  }
+   background: white;
+   border-bottom: 1px solid $orange;
+   position: fixed;
+   z-index: 1000;
+   height: $header-height;
+   width: 100%;
+   ul {
+      list-style: none;
 
-  nav {
-    ul {
       li {
-        display: inline-block;
-        padding: (($header-height / 4) - 3px) 20px 0 ;
-        height: $header-height;
-        margin: 0 5px;
-
-        &:not(.staticitem):hover {
-          border-bottom: 5px solid $alizarin;
-        }
-        span {
-          vertical-align: middle;
-          color: $darkgray;
-          cursor:pointer;
-          font-size: 1.2em;
-        }
+         display: inline;
+         h1 {
+            font-size: 1.5em;
+            display: inline-block;
+            font-weight: 300;
+            color: $darkgray;
+         }
+         .search {
+            display: inline-block;
+            padding: 0 10px;
+            input {
+               display: inline-block;
+               border-radius: 4px;
+               border-color: $lightergray;
+               box-shadow: none;
+               padding: 0 0.5em;
+            }
+         }
+      }
+   }
 
+   nav {
+      ul {
+         li {
+            display: inline-block;
+            padding: (($header-height / 4) - 3px) 20px 0 ;
+            height: $header-height;
+            margin: 0 5px;
+
+            &:not(.staticitem):hover {
+               border-bottom: 5px solid $alizarin;
+            }
+            span {
+               vertical-align: middle;
+               color: $darkgray;
+               cursor:pointer;
+               font-size: 1.2em;
+            }
+
+         }
       }
-    }
-  }
-
-  .subnav {
-    background: $alizarin;
-    position: fixed;
-    top: $header-height;
-    padding: 10px 20px;
-    border-radius: 0 0 5px 5px;
-    min-width: 100px;
-    color: white;
-    ul li {
-      padding: 4px 10px;
-      a {
-        color: lighten($lightergray, 5%);
-        text-shadow: 0 1px 1px $darkgray;
-        &:hover {
-          color: white;
-        }
+   }
+
+   .subnav {
+      background: $alizarin;
+      position: fixed;
+      top: $header-height;
+      padding: 10px 20px;
+      border-radius: 0 0 5px 5px;
+      min-width: 100px;
+      color: white;
+      ul li {
+         padding: 4px 10px;
+         a {
+            color: lighten($lightergray, 5%);
+            text-shadow: 0 1px 1px $darkgray;
+            &:hover {
+               color: white;
+            }
+         }
       }
-    }
-  }
+   }
 }
 
 
@@ -126,105 +126,117 @@ ul{
       }
 
    }
-  &.whitewidget {
-    background: white;
-  }
+   &.whitewidget {
+      background: white;
+   }
 }
 
 fieldset {
-  label {
-    padding: 0px 0px 5px 0px;
-  }
-  .permissions {
-    margin: 0 10px;
-
-    .field {
-      height: 16em;
-      border: 1px solid $lightergray;
-      color: $darkgray;
-
-      padding: 5px 10px;
-      overflow-y: auto;
-      ul {
-        list-style: none;
-        li {
-          cursor: pointer;
-          i.green-text {
-            color: $emerald;
-          }
-        }
+   label {
+      padding: 0px 0px 5px 0px;
+   }
+   .permissions {
+      margin: 0 10px;
+
+      .field {
+         height: 16em;
+         border: 1px solid $lightergray;
+         color: $darkgray;
+
+         padding: 5px 10px;
+         overflow-y: auto;
+         ul {
+            list-style: none;
+            li {
+               cursor: pointer;
+               i.green-text {
+                  color: $emerald;
+               }
+            }
+         }
       }
-    }
-  }
+   }
 }
 
 .dashboard-body {
-  padding-top: $header-height + 20px;
+   padding-top: $header-height + 20px;
 }
 
 .buttons-header {
-  span {
-    margin: 5px 5px 5px;
-  }
+   span {
+      margin: 5px 5px 5px;
+   }
 }
 
 .input-error {
-  border-color: $alizarin !important;
+   border-color: $alizarin !important;
 }
 
 // Tabs --------------------------------------------------------
 @mixin active-tab ($color){
-  border-bottom: $tab-bottom-border solid $color;
+   border-bottom: $tab-bottom-border solid $color;
 }
 
 .tabs {
-  width: 100%;
-  background: #fff;
-  border-radius: 4px;
-  border: 1px solid $lightergray;
-  border-bottom: $tab-bottom-border solid $lightgray;
-  padding: 0 10px;
-  font-size: 14px;
-  height: $tabs-height;
-  color: $lightergray;
-  ul {
-    list-style: none;
-
-    li {
-      color: $darkgray;
-      display: inline-block;
-      position: relative;
-      padding: 10px 20px;
-      cursor: pointer;
-      height: $tabs-height - 1px;
-
-      &.active {
-        &.tab1{
-          @include active-tab($emerald);
-        }
-        &.tab2{
-          @include active-tab($alizarin);
-        }
-        &.tab3{
-          @include active-tab($peter_river);
-        }
-        &.tab4{
-          @include active-tab($orange);
-        }
+   width: 100%;
+   background: #fff;
+   border-radius: 4px;
+   border: 1px solid $lightergray;
+   border-bottom: $tab-bottom-border solid $lightgray;
+   padding: 0 10px;
+   font-size: 14px;
+   height: $tabs-height;
+   color: $lightergray;
+   ul {
+      list-style: none;
 
+      li {
+         color: $darkgray;
+         display: inline-block;
+         position: relative;
+         padding: 10px 20px;
+         cursor: pointer;
+         height: $tabs-height - 1px;
+
+         &.active {
+            &.tab1{
+               @include active-tab($emerald);
+            }
+            &.tab2{
+               @include active-tab($alizarin);
+            }
+            &.tab3{
+               @include active-tab($peter_river);
+            }
+            &.tab4{
+               @include active-tab($orange);
+            }
+
+         }
       }
-    }
-  }
+   }
 }
 
 
 .filter_box {
-  fieldset {
-    background: $peter_river;
-    border-color: darken($peter_river, 5%);
-  }
+   fieldset {
+      background: $peter_river;
+      border-color: darken($peter_river, 5%);
+   }
 }
 
 .nonestyle {
    list-style: none;
 }
+
+.fancy_table {
+   border: 1px solid $lightergray;
+   padding: 0px 0px !important;
+   thead {
+      tr {
+         th {
+            padding: 0;
+         }
+      }
+   }
+}

data/app/controllers/faalis/api_controller.rb

@@ -16,129 +16,132 @@
 #    with this program; if not, write to the Free Software Foundation, Inc.,
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # -----------------------------------------------------------------------------
-require_dependency "faalis/api_controller"
+require_dependency 'faalis/api_controller'
 
+module Faalis
+  # This class is the base class of all API controllers in any **Faalis**
+  # host applications. Each host Rails application should have an `APIController`
+  # which inherit from this class.
+  class APIController < Faalis::ApplicationController
 
-# This class is the base class of all API controllers in any **Faalis**
-# host applications. Each host Rails application should have an `APIController`
-# which inherit from this class.
-class Faalis::APIController < Faalis::ApplicationController
+    # Only support `json` format
+    respond_to :json
 
-  @@allowed_fields = []
+    # Authenticate user before any action take place
+    before_filter :authenticate_filter
 
-  # Only support `json` format
-  respond_to :json
+    # Check for any presence of filtering query, In querystring and load
+    # resource using them
+    before_filter :load_resource_by_query, :only => [:index]
 
-  # Authenticate user before any action take place
-  before_filter :authenticate_filter
+    protect_from_forgery
 
-  # Check for any presence of filtering query, In querystring and load
-  # resource using them
-  before_filter :load_resource_by_query, :only => [:index]
+    # Set csrf cookie after any action
+    after_filter :set_csrf_cookie_for_ng
 
+    # Rescue from any access denied exception raised from cancan and
+    # returns a useful error message in json
+    rescue_from CanCan::AccessDenied do |exception|
+      render :status => 403, :json => {
+        :error => _('You don\'t have access to this page'),
+        :orig_msg => exception.message,
+        :action => exception.action
+      }
+    end
 
-  protect_from_forgery
-
-  # Set csrf cookie after any action
-  after_filter :set_csrf_cookie_for_ng
-
-  # Rescue from any access denied exception raised from cancan and
-  # returns a useful error message in json
-  rescue_from CanCan::AccessDenied do |exception|
-
-    render :status => 403, :json => {
-      :error => _("You don't have access to this page"),
-      :orig_msg => exception.message,
-      :action => exception.action,
-    }
-  end
-
-  def set_csrf_cookie_for_ng
-    cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
-  end
-
-  # User authentication for API services take place here. By default
-  # **Faalis** uses the authentication method of **Devise** to authenticate
-  # access to API service.
-  #
-  # If you want to change authentication method ? just override this method
-  # in you **APIController**
-  def authenticate_filter
-    authenticate_user!
-  end
+    def set_csrf_cookie_for_ng
+      cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
+    end
 
-  # Load resource by using parameters specified in querystring.
-  def load_resource_by_query
-    # If any query string parameter provided and allow fields specified
-    if not request.query_parameters.empty? and not allowed_fields.empty?
-
-      logger.info ("Load resource by query parameters")
-      # Iterate over parameters in query string
-      request.query_parameters.each do |key, value|
-        # each key can be like filename[__querytype]=value
-        # which `querytype` is string that specify the query type scope
-        # to use in model. For example these is a query type scope called
-        # `gt` which mean the mentioned field should be greater than the
-        # value
-        field, query_type = key.split("__")
-
-        if allowed_fields.include? field
-          # If field name is in the allowed list
-          # If no query type specified we will use assignment scope.
-          if query_type.nil?
-            query_type = "assignment"
-          end
+    # User authentication for API services take place here. By default
+    # **Faalis** uses the authentication method of **Devise** to authenticate
+    # access to API service.
+    #
+    # If you want to change authentication method ? just override this method
+    # in you **APIController**
+    def authenticate_filter
+      authenticate_user!
+    end
 
-          # If model have an scope with the "#{query_type}_query" name.
-          # Otherwise skip
-          if model_class.respond_to? "#{query_type}_query"
+    # Load resource by using parameters specified in querystring.
+    def load_resource_by_query
+      # If any query string parameter provided and allow fields specified
+      if !request.query_parameters.empty? && !allowed_fields.empty?
+
+        logger.info ('Load resource by query parameters')
+        # Iterate over parameters in query string
+        request.query_parameters.each do |key, value|
+          # each key can be like filename[__querytype]=value
+          # which `querytype` is string that specify the query type scope
+          # to use in model. For example these is a query type scope called
+          # `gt` which mean the mentioned field should be greater than the
+          # value
+          field, query_type = key.split('__')
+
+          if allowed_fields.include? field
+            # If field name is in the allowed list
+            # If no query type specified we will use assignment scope.
+            query_type = 'assignment' if query_type.nil?
+
+            # If model have an scope with the "#{query_type}_query" name.
+            # Otherwise skip
+            if model_class.respond_to? "#{query_type}_query"
+
+              # If resource already loaded. If there was a instnace variable
+              # with the plural name of the resource exists then resource
+              # already loaded and we should chain new conditions
+              if instance_variable_defined? "@#{controller_name}"
+                var = instance_variable_get("@#{controller_name}")
+                var.send("#{query_type}_query".to_sym, field, value)
+              else
+                # Resource did not loaded we make first query
+                # (without touching database) and set the corresponding
+                # instance variables
+                relation_object = model_class.send("#{query_type}_query".to_sym,
+                                                   field, value)
+                instance_variable_set("@#{controller_name}", relation_object)
+              end
 
-            # If resource already loaded. If there was a instnace variable
-            # with the plural name of the resource exists then resource
-            # already loaded and we should chain new conditions
-            if instance_variable_defined? "@#{controller_name}"
-              instance_variable_get("@#{controller_name}").send("#{query_type}_query".to_sym, field, value)
             else
-              # Resource did not loaded we make first query
-              # (without touching database) and set the corresponding
-              # instance variables
-              relation_object = model_class.send("#{query_type}_query".to_sym, field, value)
-              instance_variable_set("@#{controller_name}", relation_object)
+              logger.info "There is no `#{query_type}_query` in `#{model_class.to_s}` model."
             end
-
           else
-            logger.info "There is no `#{query_type}_query` in `#{model_class.to_s}` model."
+            logger.warn "`#{field}` in not in allowed list for `#{self.class.to_s}`."
           end
-        else
-          logger.warn "`#{field}` in not in allowed list for `#{self.class.to_s}`."
         end
+      else
+        logger.info('Load resource using `load_resource`')
+        #self.class.load_resource
       end
-    else
-      logger.info("Load resource using `load_resource`")
-      #self.class.load_resource
     end
-  end
 
-  # An array of allowed fields for query loading
-  def allowed_fields
-    @@allowed_fields
-  end
+    # This attribute holds the allowed fileds which we will allow for
+    # making query
+    def allowed_fields
+      return allowed_query_on if self.respond_to?(:allowed_query_on, true)
+      @allowed_fields || []
+    end
 
-  # Using this query you can activate the query loading system
-  # and specify fields which you want to use in query loading
-  def self.allow_query_on(*args)
-    @@allowed_fields = args.to_a.collect { |x| x.to_s }
-  end
+    # Using this query you can activate the query loading system
+    # and specify fields which you want to use in query loading
+    def self.allow_query_on(*args)
+      #instance_variable_set(:@allowed_fields, args.to_a.collect { |x| x.to_s })
+      define_method :allowed_query_on do
+        args.to_a.collect { |x| x.to_s }
+      end
+      private :allowed_query_on
+    end
 
-  protected
+    protected
 
-  # Model class related to this controller.
-  def model_class
-    controller_name.singularize.classify.constantize
-  end
+    # Model class related to this controller.
+    def model_class
+      controller_name.singularize.classify.constantize
+    end
 
-  def verified_request?
-    super || form_authenticity_token == request.headers['X-XSRF-TOKEN']
-  end
+    def verified_request?
+      super || form_authenticity_token == request.headers['X-XSRF-TOKEN']
+    end
 
+  end
 end