society 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc37087bf77e5926995f88e6dfd7a272014262e
-  data.tar.gz: 66dd7cc197f88380fd15eaacfd716db8ca0e4f21
+  metadata.gz: 673c9e8f1e17a3c47e6605eeaa6e7a70ac9740da
+  data.tar.gz: 63318b570c05e025cbcb26375d9e57ac5dba42be
 SHA512:
-  metadata.gz: bd1dbd1bc16568ed19d5bd4916b9d014a561228faefd17ca6e47e027a1dda36120dc50dc748c14d88ee549b6efd69067b054cf10c18bdc98adf02da8f685e0f7
-  data.tar.gz: 4d29dbb97f01bd056050d3955cd28035f21b0bac4a273abea3483cc37d73d65bc9787c6b34babc59c88134acef7effc88138fcd34cbbc810e48c1350c1280ff4
+  metadata.gz: c2098f06fb8b71b4eef9d0a89eef8c1505b30b98c1a9ef9cf48e0e6a3e15e60e6b84f48b42f512b66ec4e8ad9101f099226851b7bfdc0e34507d2b3517266a6a
+  data.tar.gz: 871e375bf40378a6592ba6d26d6cf35e765ab26f52e55de508021362ce68420cfa00572757925d1e7ccb32d18644430504ef2888b40a375e92a919c27caf5716

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,74 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
 
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+## Our Standards
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+Examples of behavior that contributes to creating a positive environment
+include:
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project owner at coraline@idolhands.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/README.md

@@ -34,14 +34,6 @@ JSON by passing `--format json`
 Note that all JSON data is timestamped (regardless of output format) to store
 snapshots of your project over time.
 
-## Updating assets
-
-All JavaScript and CSS dependencies are checked into the repo, so any given
-commit should have everything it needs. However, if you're developing the gem
-and need to pull in updates from the
-[society-assets](https://github.com/CoralineAda/society-assets) package, you
-can do so on the command line with `$ bower update`.
-
 ## Recognition
 
 Society was inspired by an original idea by Kerri Miller (@kerrizor).
@@ -53,7 +45,7 @@ Please note that this project is released with a [Contributor Code of Conduct]
 By participating in this project you agree to abide by its terms.
 
 
-1. Fork it ( https://github.com/[my-github-username]/society/fork )
+1. Fork it ( https://github.com/CoralineAda/society/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/society/formatter/report/templates/components/society-assets/society.css

@@ -10,6 +10,7 @@
   stroke: #fff;
 }
 
+.society-
 .society-heatmap-select,
 .society-network-toggle {
   display: block;
@@ -18,17 +19,19 @@
 }
 
 .society-heatmap-select {
-  display: block;
+  display: inline;
   color: #555;
   background-color: #fff;
   border: 1px solid #ccc;
   border-radius: 4px;
-  height: 3em;
+  height: 2em;
   padding: 6px 12px;
-  font-size: 14px;
   line-height: 1.42857143;
   background-image: none;
-  margin: auto;
+}
+
+label.society-heatmap-select-label {
+  font: 300 12px "Helvetica Neue", Helvetica, Arial, sans-serif !important;
 }
 
 .society-network-toggle input {
@@ -49,11 +52,11 @@
 }
 
 .society-node--source {
-  fill: #2ca02c;
+  fill: #009191;
 }
 
 .society-node--target {
-  fill: #d62728;
+  fill: #d66a00;
 }
 
 .society-node--faded {
@@ -66,10 +69,32 @@
   stroke-width: 2px;
 }
 
+.society-link {
+  stroke: #000;
+}
+
 .society-link--source {
-  stroke: #d62728;
+  stroke: #009191;
 }
 
 .society-link--target {
-  stroke: #2ca02c;
+  stroke: #d66a00;
+}
+
+.key-green {
+  height: 1em;
+  background-color: #009191;
+  padding: .25em;
+  color: #fff;
+}
+
+.key-red {
+  height: 1em;
+  background-color: #d66a00;
+  padding: .25em;
+  color: #fff;
+}
+
+.instructions {
+  width: 100%;
 }

data/lib/society/formatter/report/templates/components/society-assets/society.js

@@ -133,21 +133,21 @@
 
     var toggleFilterOnlyDeps = function(d) {
       if (this.depsFiltered == false) {
-	nodeAnchor.selectAll(".society-node--faded")
-	  .style("visibility", "hidden");
-	linkAnchor.selectAll(".society-link")
-	  .filter(":not(.society-link--source)")
-	  .filter(":not(.society-link--target)")
-	  .style("visibility", "hidden");
-	this.depsFiltered = true;
+  nodeAnchor.selectAll(".society-node--faded")
+    .style("visibility", "hidden");
+  linkAnchor.selectAll(".society-link")
+    .filter(":not(.society-link--source)")
+    .filter(":not(.society-link--target)")
+    .style("visibility", "hidden");
+  this.depsFiltered = true;
       } else {
-	d3
-	  .selectAll(".society-node")
-	  .style("visibility", "visible");
-	d3
-	  .selectAll(".society-link")
-	  .style("visibility", "visible");
-	this.depsFiltered = false;
+  d3
+    .selectAll(".society-node")
+    .style("visibility", "visible");
+  d3
+    .selectAll(".society-link")
+    .style("visibility", "visible");
+  this.depsFiltered = false;
       }
     };
 
@@ -303,12 +303,19 @@
         z = d3.scale.linear().domain([0, 4]).clamp(true),
         c = d3.scale.category10().domain(d3.range(10));
 
-    var orderSelect = this.element.append('select')
-      .attr('class', 'society-heatmap-select')
+    var controls = this.element.append('div')
+      .attr('class', 'society-heatmap-controls');
+
+    var orderSelectLabel = controls.append('label')
+      .attr("for", "society-heatmap-select")
+      .attr('class', 'society-heatmap-select-label')
       .text('Order by:');
-    orderSelect.append('option').text('by Name').attr('value', 'name');
-    orderSelect.append('option').text('by Frequency').attr('value', 'count');
-    orderSelect.append('option').text('by Cluster').attr('value', 'group');
+
+    var orderSelect = controls.append('select')
+      .attr('class', 'society-heatmap-select')
+    orderSelect.append('option').text('Name').attr('value', 'name');
+    orderSelect.append('option').text('Frequency').attr('value', 'count');
+    orderSelect.append('option').text('Cluster').attr('value', 'group');
     orderSelect.on('change', function() {
       order(this.value);
     });
@@ -400,7 +407,6 @@
             .attr("width", x.rangeBand())
             .attr("height", x.rangeBand())
             .style("fill-opacity", function(d) { return z(d.z); })
-            .style("fill", function(d) { return nodes[d.x].group == nodes[d.y].group ? c(nodes[d.x].group) : null; })
             .on("mouseover", mouseover)
             .on("mouseout", mouseout);
     }

data/lib/society/formatter/report/templates/index.htm.haml

@@ -5,7 +5,10 @@
       %title Society Relational Analysis
       :css
         @import url(stylesheets/society.css);
+        @import url(http://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css)
       %script{:src => "javascripts/d3.min.js"}
+      %script{:src => "http://code.jquery.com/jquery-1.10.2.js"}
+      %script{:src => "http://code.jquery.com/ui/1.11.4/jquery-ui.js"}
       %script{:src => "javascripts/society.js"}
       :css
         body {
@@ -14,24 +17,37 @@
           font-family: Consolas, Verdana, sans-serif;
           font-size: 12px;
         }
-  %body
+        $(function() {
+          $( "#tabs" ).tabs();
+        });
+      %body
     %div{:style => "text-align: center;"}
-      %h1 Relational Matrices
+      %h1 Object Relational Matrices
       %h3
         Generated by
         %a{:href => "https://github.com/Bantik/society"} Society
-    %hr{:size => "1"}/
-    %div{:style => "text-align: center;"}
-      %h2 Heatmap
-    #heatmap
-    %hr{:size => "1"}/
-    %div{:style => "text-align: center;"}
-      %h2 Network
-      %p
-        %em
-          Hover over a class name to see incoming references (green) and outgoing
-          references (red).
-    #network{:style => "height: 100%; width: 100%;"}
+    #tabs
+      %ul
+        %li
+          %a{:href => "#tabs-1"} Network
+        %li
+          %a{:href => "#tabs-2"} Heat Map
+      #tabs-1
+        %div
+          %h2 Network
+          %p.instructions
+            Hover over a class name to see
+            %span.key-green incoming references
+            and
+            = succeed "." do
+              %span.key-red outgoing references
+            Double-click on a class name to enter
+            focus mode. Press ESC to return to the full view.
+        #network{:style => "height: 100%; width: 100%;"}
+      #tabs-2
+        %div
+          %h2 Heatmap
+        #heatmap
     :javascript
       var data = JSON.parse('#{json_data}');
       Society.generate("#network", {
@@ -45,4 +61,6 @@
           json: data
         }
       });
-
+      $(function() {
+        $( "#tabs" ).tabs();
+      });

data/lib/society/version.rb

@@ -1,3 +1,3 @@
 module Society
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: society
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Coraline Ada Ehmke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,7 +188,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".bowerrc"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
@@ -198,7 +197,6 @@ files:
 - README.md
 - Rakefile
 - bin/society
-- bower.json
 - lib/society.rb
 - lib/society/cli.rb
 - lib/society/edge.rb

data/.bowerrc

@@ -1,3 +0,0 @@
-{
-  "directory": "lib/society/formatter/report/templates/components"
-}

data/bower.json

@@ -1,6 +0,0 @@
-{
-  "name": "society",
-  "dependencies": {
-    "society-assets": "1.2.0"
-  }
-}