r_kit 0.5 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5323abaf73afe8d62b58cb816884632fbdbdcf
-  data.tar.gz: a67bb90a5cdfa7a0b8bd9264107c1e2f8c80ac7b
+  metadata.gz: bdb67eccab0559337e3ceb3ffac44abe7a5a0eb7
+  data.tar.gz: 97dbedfa706dcd908c2afa34a480c7fe3ea8cf0e
 SHA512:
-  metadata.gz: 27e1256e0174889ca92e9283c207f07ed816fe6f7d4a8cc57defb009c0c4e0339ee5d206682dc9fbb67be275bdff60bb226b712abba852321f0d3fef348a12f6
-  data.tar.gz: c1a6450e8c1ea08ff888dd50e18a8a58753266b98f1cd5e3e5bc23966455acba675af93a095c08e3b721205c0d7630a245f5a5984364b1da887ab678a1c5fac8
+  metadata.gz: fb8202557efbd77f2bbc38c993f5d3a0391bd8bb94272e2d078dedee01eb6b566c1a87a010bc2b27989372cad25c00b147754a3f2c540dda077fffd5407b8ef6
+  data.tar.gz: 55be195d767611126530b158969e4b7e151718e17d91c582d746048c70528863c78b2c3662904598df6927412c696a881290a5dfefdcd85f05bd7794a50730fd

data/lib/r_kit/active_record_utility/active_record_extend.rb

@@ -1,20 +1,36 @@
-module RKit::ActiveRecordUtility::ActiveRecordExtend
+class ActiveRecord::Base
 
-  def collection_finder **options
-    all
-      .then(if: :acts_as_poolables?){ |collection| collection.pool options[:pool] }
-      .then(if: :acts_as_publishables?){ |collection| collection.published.publication_desc }
-      .then(if: :acts_as_seriables?){ |collection| collection.series options[:series] }
+  override_singleton_method :scope do |name, body, &block|
+    __olddef__(name, body, &block).tap do |scope_name|
+
+      override_singleton_method scope_name do |*args, &block|
+        __olddef__(*args, &block).tap do |collection|
+          collection.scopes << scope_name
+        end
+      end
+
+    end
   end
 
-  def instance_finder **options
-    if acts_as_taggables?
-      tagged options[:tag]
-    else
-      find_by id: options[:id]
+
+  depend on: :frame do
+    def scoped? *args
+      frame.scoped? *args
     end
   end
 
+end
+
+
+class ActiveRecord::Relation
+
+  attr_reader :scopes, default: proc{ [] }
+
+  def scoped? name
+    scopes.include? name
+  end
+
+  RKit::Frame::CollectionDsl.domain self
+  acts_as_frameable_collection
 
-  ActiveRecord::Base.extend self
 end

data/lib/r_kit/active_record_utility/utilities/series.rb

@@ -16,9 +16,8 @@ class RKit::ActiveRecordUtility::Series
 
   allowed? do
     table_exists? &&
-      column_names.include_all?(["following_id", "series"]) &&
-      columns_hash["following_id"].type == :integer &&
-      columns_hash["series"].type == :string
+      column_names.include?("following_id") &&
+      columns_hash["following_id"].type == :integer
   end
 
   restricted do
@@ -31,10 +30,10 @@ class RKit::ActiveRecordUtility::Series
     has_one :followed, class_name: name, foreign_key: "following_id"
     belongs_to :following, class_name: name
 
-    before_validation if: :following_id_changed? do
-      self.title ||= following.title if __class__.column_exists? "title"
-      self.series = following.series.name
-    end
+    # before_validation if: :following_id_changed? do
+      # self.title ||= following.title if __class__.column_exists? "title"
+      # self.series = following.series.name
+    # end
 
 
 
@@ -47,15 +46,11 @@ class RKit::ActiveRecordUtility::Series
 
     # TODO: validates a record can only have one follower (or is it hadled by the "has_one" relation directly ?)
 
-    validates_presence_of :series, if: :following
+    # validates_presence_of :series, if: :following
     validates_uniqueness_of :following_id, if: :following
 
-    scope :series, ->(series){ series && where(series: series) }
-
-    # TODO: adapter le scope pour intégrer les published (si interfered)
-    # je laisse en commentaire parceque j'aime pas le nom du scope,
-    # et j'ai pas d'idée là maintenant (à part 'pilotes', ou 'firsts')
-    # scope :firsts_of_series, ->{ where(following_id: nil) }
+    # scope :series, ->(series){ series && where(series: series) }
+    scope :firsts_of_series, ->{ where(following_id: nil) }
 
     # TODO: scope pour l'ordre dans une serie (pour le decorator pagination_tag)
 
@@ -64,21 +59,37 @@ class RKit::ActiveRecordUtility::Series
 
 
   methods :instance do
+    def first_of_serie
+      following ? following.send(__method__) : self
+    end
+
     def series
-      series_struct if read_attribute(:series)
-      # @@_active_record_utilities_series[read_attribute(:series)] ||= series_struct if read_attribute(:series)
-      # TODO: if series changes, or new element added, series must be re-calculated
-      # maybe pre-calc this in after save
+      first_of_serie.nexts_of_serie if in_a_series?
     end
 
-    def series_struct
-      OpenStruct.new.tap do |series_struct|
-        series_struct.name = read_attribute :series
-        series_struct.collection = __class__.series series_struct.name
-        series_struct.size = series_struct.collection.count
-      end
+    def in_a_series?
+      following || followed
+    end
+
+    def nexts_of_serie
+      followed ? [self] + followed.send(__method__) : [self]
     end
 
+    # def series
+    #   series_struct if read_attribute(:series)
+    #   # @@_active_record_utilities_series[read_attribute(:series)] ||= series_struct if read_attribute(:series)
+    #   # TODO: if series changes, or new element added, series must be re-calculated
+    #   # maybe pre-calc this in after save
+    # end
+    #
+    # def series_struct
+    #   OpenStruct.new.tap do |series_struct|
+    #     series_struct.name = read_attribute :series
+    #     series_struct.collection = __class__.series series_struct.name
+    #     series_struct.size = series_struct.collection.count
+    #   end
+    # end
+
     def position_in_series
       following ? following.send(__method__) + 1 : 1
     end
@@ -86,77 +97,104 @@ class RKit::ActiveRecordUtility::Series
 
 
   methods :decorator do
-    after_initialize do
+    #after_initialize do
       # TODO: this can't stay this way, if "serie" is pre-calculated
       # & shared accros instances & kept in memory (class variable)
 
       # series.collection = series.collection.decorate if series
       # TODO: infinite loop, need a "unless" on the after_init, or smthng even more smart
       # ps: i'm not happy with this current decorate
-    end
+    #end
 
-    def series_url
-      view.url_for [__class__, series: series.name]
-    end
+    # depend on: :series do
+    #   def series_url
+    #     view.url_for [__class__, series: series.name]
+    #   end
+    #
+    #   def link_to_series
+    #     view.link_to series.name, series_url, class: :btn
+    #   end
+    # end
 
-    def link_to_series
-      view.link_to series.name, series_url, class: :btn
-    end
 
     if decorated_class.columns_hash["title"]
-      # TODO: I don't get this "showcase thing", we can delete that and just look into the view for the params
-      # Or in the collection, to see if the scope is applied (second solution is better)
-      def series_title
-        "#{ __getobj__.title } <small><i class='no-warp'>(vol #{ position_in_series })</i></small>".html_safe
-      end
-
-      def showcase_title
-        "#{ __getobj__.title } <small><i class='no-warp'>(#{ series.size } vols)</i></small>".html_safe
-      end
-
-      def title options = {}
-        if series and false # and showcase
-          showcase_title
-        elsif series
-          series_title
-        else
-          super()
+      depend on: :series, strict: false do
+
+        # TODO: I don't get this "showcase thing", we can delete that and just look into the view for the params
+        # Or in the collection, to see if the scope is applied (second solution is better)
+        # TODO: to make a decision, we need to know if 'first_of_Series' scope is applied
+        # for that, we need to add behavior to 'scope' (ActiveRecord::Scoping::Named::ClassMethods)
+        # and, on an instance, to keep the 'collection where it come from' intel (?? ennumerable first, etc ??)
+        def series_title
+          "#{ __getobj__.title } <small><i class='no-warp'>(vol #{ position_in_series })</i></small>".html_safe
         end
-      end
-    end
 
-    # TODO: put default locales keys ("vol" is hard coded here) in cluster
-    # same for the 'title' methods before
-    # TODO: the "disabled" link for self doesn't work yet
-    # in fact, the collection does not use the "self" object, so the singleton_class is lost
-    def pagination_tag
-      disable_pagination_link self
-      series.collection.decorate.map(&:pagination_link_to).reduce(:safe_concat)
-    end
+        def showcase_title
+          "#{ __getobj__.title } <small><i class='no-warp'>(#{ series.size } vols)</i></small>".html_safe
+        end
 
-    def pagination_link_to
-      view.link_to "vol #{ position_in_series }", self, class: :btn
-    end
+        # TODO: title don't work if there is no series
+        # cause 'depend' stille define the method, but will return nil
+        def title options = {}
+          if showcase
+            showcase_title
+          else
+            series_title
+          end
+        end
 
-    def disabled_pagination_link_to
-      view.content_tag :span, "vol #{ position_in_series }", class: :'btn-disabled'
-    end
+        # TODO: don't ssems to work in decorated obj
+        def showcase
+          scoped? :firsts_of_series
+          # collection_context.then{ |collection| collection.scoped? :firsts_of_series }
+        end
 
-    def disable_pagination_link seriable_instance
-      class << seriable_instance
-        alias :pagination_link_to :disabled_pagination_link_to
       end
     end
 
-
-    # TODO: put default locales keys (:previous, :next) in cluster
-    def navigation_tag
-      view.content_tag :p do
-        safe_buffer = ActiveSupport::SafeBuffer.new
-        safe_buffer += view.link_to view.t(:previous), following, class: :btn if following
-        safe_buffer += " "
-        safe_buffer += view.link_to view.t(:next), followed, class: :btn if followed
-        safe_buffer
+    depend on: :series do
+
+      # # TODO: put default locales keys ("vol" is hard coded here) in cluster
+      # # same for the 'title' methods before
+      # # TODO: the "disabled" link for self doesn't work yet
+      # # in fact, the collection does not use the "self" object, so the singleton_class is lost
+      # def pagination_tag
+      #   series.collection.decorate.map{ |x|
+      #     if x === self
+      #       x.disabled_pagination_link_to
+      #     else
+      #       x.pagination_link_to
+      #     end
+      #   }.reduce(:safe_concat)
+      # end
+      #
+      # def pagination_link_to
+      #   view.link_to "vol #{ position_in_series }", self, class: :btn
+      # end
+      #
+      # def disabled_pagination_link_to
+      #   view.content_tag :span, "vol #{ position_in_series }", class: :'btn-disabled'
+      # end
+
+
+      def navigation_tag
+        view.content_tag :p do
+          safe_buffer = ActiveSupport::SafeBuffer.new
+
+          if following
+            safe_buffer += view.link_to(following, class: :btn){ view.fa_icon('angle-left') + " Previous" }
+          end
+
+          if following && followed
+            safe_buffer += " "
+          end
+
+          if followed
+            safe_buffer += view.link_to(followed, class: :btn){ "Next ".html_safe + view.fa_icon('angle-right') }
+          end
+
+          safe_buffer
+        end
       end
     end
   end

data/lib/r_kit/active_record_utility/utilities/tag.rb

@@ -20,11 +20,15 @@ class RKit::ActiveRecordUtility::Tag
     validates_presence_of :tag
     validates_uniqueness_of :tag
 
-    def tagged(tag) find_by tag: tag end
+    def tagged(tag) find_by tag: tag.underscore end
   end
 
   methods :instance do
-    def to_param() tag end
+    def to_param() tag.dasherize end
+  end
+
+  methods :decorator do
+    delegate :to_param, to: :__getobj__
   end
 
 end

data/lib/r_kit/active_record_utility.rb

@@ -1,6 +1,8 @@
 class RKit::ActiveRecordUtility
 
   dependency :dsl,
+    :frame,
+    :override,
     :utility
 
   load_path __FILE__,

data/lib/r_kit/core/loader.rb

@@ -44,7 +44,7 @@ class RKit::Core::Loader
 
 
   def loaded!
-    __class__.instance_variable_get("@loaded") << _base.name
+    self.class.instance_variable_get("@loaded") << _base.name
   end
 
 

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/base/typography/hr.scss

@@ -0,0 +1,5 @@
+hr{
+  border: none {
+    top: solid 1px text-color();
+  };
+}

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/base/typography/links.scss

@@ -2,6 +2,8 @@ a{
 	color: link-color();
 	text-decoration: none;
 
+	transition: all .2s;
+
 	&:hover{
 		text-decoration: underline;
 	}

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/base/typography/paragraphs.scss

@@ -1,5 +1,7 @@
 p{
-	font-weight: 200;
+	font-weight: 100;
+	letter-spacing: .0625rem;
+	word-spacing: .0625rem;
 	line-height: 1.4em;
 	text-align: justify;
 

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/base/typography/titles.scss

@@ -1,10 +1,12 @@
 h1,
 h2,
 h3{
-	font-weight: 200;
+	font-weight: 100;
+	letter-spacing: .0625rem;
+
 	margin: 1em 0;
 
-  @include link-styled-title;
+  @include link-title;
 }
 
 h1{

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/base/typography.scss

@@ -1,3 +1,4 @@
+@import "typography/hr";
 @import "typography/links";
 @import "typography/lists";
 @import "typography/paragraphs";

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/components/btn.scss

@@ -4,6 +4,9 @@
 
 	padding: .625em;
 
+	font-weight: 200;
+  letter-spacing: 0;
+
 	background-color: btn-background-color();
 	color: btn-color();
 }

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/alignments.scss

@@ -0,0 +1,7 @@
+@mixin verticaly-centered() {
+  display: flex;
+  flex-wrap: wrap;
+
+  align-content: center;
+  height: 100%;
+}

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/blocks.scss

@@ -0,0 +1,4 @@
+@mixin highlighted-block() {
+  color: rgba(white-color(), .65);
+  background-color: rgba(black-color(), .85);
+}

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/box-shadows/curved-shadows.scss

@@ -6,7 +6,7 @@
   border-radius: 50%;
   z-index: -1;
   content: "";
-  box-shadow: 0 0 1em .25em black;
+  box-shadow: 0 0 1em .25em dark-black-color();
 }
 
 

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/box-shadows/straight-shadows.scss

@@ -1,3 +1,3 @@
 @mixin normal-box-shadow() {
-  box-shadow: 0 0 1em black;
+  box-shadow: 0 0 1em dark-black-color();
 }

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/links.scss

@@ -3,3 +3,15 @@
   text-decoration: inherit;
   cursor: inherit;
 }
+
+@mixin highlighted-link() {
+
+  @include highlighted-block;
+
+  &:hover{
+    color: rgba(white-color(), .85);
+    background-color: rgba(black-color(), .80);
+
+    text-decoration: inherit;
+  }
+}

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins/titles.scss

@@ -1,18 +1,14 @@
-@mixin link-styled-title() {
+@mixin link-title() {
 	a{
     @include unstyled-link();
 
-		&:hover{
-			opacity: .75;
-      text-decoration: none;
-		}
-	}
-}
+		display: block;
+
+		margin: -1em 0;
+		padding: 1em 0;
 
-@mixin link-unstyled-title() {
-	a{
 		&:hover{
-			opacity: 1;
+			text-decoration: none;
 		}
 	}
 }

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/mixins.scss

@@ -1,4 +1,6 @@
+@import "mixins/alignments";
 @import "mixins/animation";
+@import "mixins/blocks";
 @import "mixins/box-shadows";
 @import "mixins/keyframes";
 @import "mixins/links";

data/lib/r_kit/css/lib/assets/stylesheets/r_kit/variables/colors.scss

@@ -1,5 +1,5 @@
 // $black
-$white: white() !default;
+$white-color: white-color() !default;
 
 
 

data/lib/r_kit/css/sass_extend.rb

@@ -2,8 +2,7 @@ module Sass::Script::Functions
 
   RKit::Css.config.colors.each do |name, value|
     color = Sass::Script.parse value, 0, 0
-
-    define_method name do
+    define_method "#{ name }_color" do
       color
     end
   end

data/lib/r_kit/css.rb

@@ -8,18 +8,20 @@ class RKit::Css
   config :colors, :grey, '#888'
   config :colors, :light_black, '#181818'
   config :colors, :red, '#b62b2b'
+  config :colors, :goldenrod, '#daa520'
   config :colors, :white, '#fbfbfb'
 
-  alias_config :colors, :primary_color, :red
-  alias_config :colors, :text_color, :grey
-  alias_config :colors, :text_alt_color, :dark_black
-  alias_config :colors, :background_color, :black
-  alias_config :colors, :background_alt_color, :light_black
+  alias_config :colors, :primary, :red
+  alias_config :colors, :link, :goldenrod
+  alias_config :colors, :text, :grey
+  alias_config :colors, :text_alt, :dark_black
+  alias_config :colors, :background, :black
+  alias_config :colors, :background_alt, :light_black
 
-  alias_config :colors, :btn_color, :background_color
-  alias_config :colors, :btn_background_color, :primary_color
-  alias_config :colors, :btn_disabled_color, :text_alt_color
-  alias_config :colors, :btn_disabled_background_color, :background_alt_color
+  alias_config :colors, :btn, :background
+  alias_config :colors, :btn_background, :primary
+  alias_config :colors, :btn_disabled, :text_alt
+  alias_config :colors, :btn_disabled_background, :background_alt
 
 
   # unused colors
@@ -28,8 +30,8 @@ class RKit::Css
 
   preset :light_colors,
     colors: {
-      text_color: '#444',
-      background_color: '#f9f9f9'
+      text: '#444',
+      background: '#f9f9f9'
 
 # $background-alt-color: #e6e6e6;
 # border color #eee

data/lib/r_kit/decoration/action_view_base_extend.rb

@@ -14,8 +14,7 @@ module RKit::Decoration::ActionViewBaseExtend
   end
 
   protected def decorate assign
-    if assign.respond_to? :decorate
-      p "go in decorate"
+    if assign.need_decoration?
       assign.decorate view_context: self
     else
       assign

data/lib/r_kit/decoration/base/collection.rb

@@ -1,20 +1,20 @@
 class RKit::Decoration::Collection < CollectionDelegator
   include RKit::Decoration::Base
 
+  def initialize *args
+    super
 
-  attr_accessor :safe_mode
+    self.singleton_class.send :override_method, :each do |&block|
+      __olddef__ do |object|
+        if object.need_decoration?
+          block.call object.decorate(view_context: view)
+        else
+          block.call object
+        end
 
-  def safe() tap{ @safe_mode = true } end
-  def unsafe() tap{ @safe_mode = false } end
-
-
-  def each &block
-    collection.each do |object|
-      if safe_mode && object.dont_respond_to?(:decorate)
-        block.call object
-      else
-        block.call object.decorate(view_context: view)
       end
     end
+
+    self.extend Enumerable
   end
 end

data/lib/r_kit/decoration/base/object.rb

@@ -1,21 +1,3 @@
 class RKit::Decoration::Object < SimpleDelegator
   include RKit::Decoration::Base
-
-
-  singleton_attr_reader :decorated_class
-  singleton_attr_reader :after_initialize_procs, default: proc{ [] }
-
-  def self.after_initialize &block
-    after_initialize_procs << block
-  end
-
-  def after_initialize!
-    decorator_class.after_initialize_procs.each{ |after_initialize_proc| self.instance_eval &after_initialize_proc }
-  end
-
-
-  def initialize obj, view_context: nil
-    super
-    after_initialize!
-  end
 end